From bugzilla-daemon at icedtea.classpath.org Fri May 1 00:15:48 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 01 May 2009 07:15:48 +0000 Subject: [Bug 330] New: Fedora 10 vuze SWT crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=330 Summary: Fedora 10 vuze SWT crash Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: hutton.stuart at gmail.com Please see the below bug report. This has happend a couple of times now while using vuze. I am not using the latest version so it may be an issue that has already been resolved in later release but this dose seem to be an issue with Java. I will upgrade to the latest version at the weekend. Thank you for looking at this bug. All the best Stu System: Linux 2.6.27.21-170.2.56.fc10.i686 #1 SMP Mon Mar 23 23:37:54 EDT 2009 i686 X Vendor: The X.Org Foundation X Vendor Release: 10503000 Selinux: No Accessibility: Disabled GTK+ Theme: Nodoka Icon Theme: Fedora Memory status: size: 0 vsize: 0 resident: 0 share: 0 rss: 0 rss_rlim: 0 CPU usage: start_time: 0 rtime: 0 utime: 0 stime: 0 cutime:0 cstime: 0 timeout: 0 it_real_value: 0 frequency: 0 ----------- .xsession-errors --------------------- # SIGSEGV (0xb) at pc=0x00dcf8a6, pid=10340, tid=10054544 # # Java VM: OpenJDK Server VM (14.0-b08 mixed mode linux-x86 ) # Distribution: Custom build (Mon Apr 6 10:18:01 EDT 2009) # Problematic frame: # V [libjvm.so+0x1da8a6] # # An error report file with more information is saved as: # /home/marinestu22/hs_err_pid10340.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 # [net] PRUDPPacketHandler: sendAndReceive to tracker.thepiratebay.org:80 failed: unresolved address -------------------------------------------------- MDRawHeader signature = 0x504d444d version = 0xa793 stream_count = 6 stream_directory_rva = 0x20 checksum = 0x0 time_date_stamp = 0x49fa9888 2009-05-01 06:36:56 flags = 0x0 mDirectory[0] MDRawDirectory stream_type = 3 location.data_size = 4516 location.rva = 0x68 mDirectory[1] MDRawDirectory stream_type = 4 location.data_size = 41692 location.rva = 0x38800 mDirectory[2] MDRawDirectory stream_type = 7 location.data_size = 56 location.rva = 0x4f320 mDirectory[3] MDRawDirectory stream_type = 15 location.data_size = 44 location.rva = 0x4f408 mDirectory[4] MDRawDirectory stream_type = 1197932545 location.data_size = 12 location.rva = 0x4f438 mDirectory[5] MDRawDirectory stream_type = 0 location.data_size = 0 location.rva = 0x0 Streams: stream type 0x0 at index 5 stream type 0x3 at index 0 stream type 0x4 at index 1 stream type 0x7 at index 2 stream type 0xf at index 3 stream type 0x47670001 at index 4 MinidumpThreadList thread_count = 94 -- 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 Fri May 1 00:35:57 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 01 May 2009 09:35:57 +0200 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <49F9F971.1010404@sun.com> References: <20090212150029.GA1121@rivendell.middle-earth.co.uk> <1234731237.3562.6.camel@hermans.wildebeest.org> <17c6771e0902151453t523b15derfc243ffaa201264f@mail.gmail.com> <1234768690.24153.28.camel@localhost.localdomain> <1234772748.3612.3.camel@hermans.wildebeest.org> <1234774554.11228.3.camel@localhost.localdomain> <1234862105.4062.8.camel@fedora.wildebeest.org> <499B727D.6060901@sun.com> <17c6771e0903200428j75e26899x9c15daf57f5ed20e@mail.gmail.com> <49E3ABEA.6020400@sun.com> <1241001697.4267.1.camel@fedora.wildebeest.org> <49F9F971.1010404@sun.com> Message-ID: <1241163358.4571.17.camel@hermans.wildebeest.org> Hi David, On Thu, 2009-04-30 at 12:18 -0700, David Cox wrote: > "Real soon now" is now, finally. We at Sun have been discussing the > idea of creating a "HotSpot Express" Project in OpenJDK through which > the stabilization of new versions of HotSpot could be managed. We > could create repositories such as > > http://hg.openjdk.java.net/hsx/14/baseline > http://hg.openjdk.java.net/hsx/14/master > > and > > http://hg.openjdk.java.net/hsx/15/baseline > http://hg.openjdk.java.net/hsx/15/master > > in which this work would be done. A "baseline" repo would be used to > collect suitable bug fixes from developers. Occasionally, these > changes would be pushed to "master" to form the basis of a stable > build. This is the model we've used at Sun for many years. If it > seems reasonable to folks, I'll ask one of HotSpot Group members to > submit a formal project proposal for consideration (Although I'm the > manager of Sun's HotSpot garbage collection and compiler teams, I'm > not actually a member of the group!) That sounds good. Thanks. So, if I understand the proposed workflow correctly, general hotspot development on the compiler, garbage collectors and runtime, will go on in the http://hg.openjdk.java.net/jdk7/hotspot-*/hotspot repos, which will be combined and merged into the http://hg.openjdk.java.net/jdk7/hotspot/hotspot/ repo by one of the hotspot gatekeepers. Then when a new "express edition" should be created a new branch under http://hg.openjdk.java.net/hsx/[xy]/baseline is made from that. And when the baseline is declared "stable" the fixes there will be pushed into http://hg.openjdk.java.net/hsx/[xy]/master. One of these hsx/[xy]/master sources will then be selected to be in http://hg.openjdk.java.net/jdk7/jdk7/hotspot/ and http://hg.openjdk.java.net/jdk6/jdk6/hotspot/ Cheers, Mark From doko at ubuntu.com Fri May 1 01:43:30 2009 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 01 May 2009 10:43:30 +0200 Subject: Add option --with-additional-vms, build once, get them all In-Reply-To: <17c6771e0904300807s169a6a4dgb40ea2145be05fb2@mail.gmail.com> References: <49F9ABB4.8090101@ubuntu.com> <17c6771e0904300807s169a6a4dgb40ea2145be05fb2@mail.gmail.com> Message-ID: <49FAB632.7040103@ubuntu.com> Andrew John Hughes schrieb: > 2009/4/30 Matthias Klose : >> The attached patch adds a configure option --with-additional-vms, which allows >> passing of --with-additional-vms=cacao,shark to build two additional vm's on an >> architecture where hotspot is the default. Allowed values are cacao, shark and >> zero. Shark is not a separate build, but the zero build configured for shark. > Rather than adding yet more conflicting options, could we not just add > --enable/disable-hotspot, so which VMs are built is determined by the > state of --enable-zero/shark/cacao/hotspot? what is conflicting about "additional"? "just" handling all combinations equally is a lot more of work, because some combinations cannot be built (hotspot with cacao), and you still would have to decide about which one gets the default. Matthias From gbenson at redhat.com Fri May 1 02:21:00 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 01 May 2009 09:21:00 +0000 Subject: changeset in /hg/icedtea6: 2009-05-01 Gary Benson changeset 34524a71ee10 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=34524a71ee10 description: 2009-05-01 Gary Benson * ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file. * ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp: Likewise. * ports/hotspot/src/share/vm/shark/sharkFunction.hpp (SharkFunction::_oopmap_frame_size): Removed field. (SharkFunction::_extended_frame_size): New field. (SharkFunction::extended_frame_size): New method. (SharkFunction::oopmap_frame_size): Updated for the above. * ports/hotspot/src/share/vm/shark/sharkFunction.cpp (SharkFunction::CreateBuildFrame): Likewise. * ports/hotspot/src/share/vm/shark/sharkState.hpp (SharkState::SharkState): Remove optional method argument. (SharkState::_frame_cache): New field. (SharkState::frame_cache): New method. * ports/hotspot/src/share/vm/shark/sharkState.cpp (SharkState::SharkState): Remove optional method argument. (SharkState::initialize): Initialize frame cache. (SharkState::equal_to): Compare frame cache. (SharkState::merge): Merge frame cache. (SharkState::decache_for_Java_call): Pass frame cache. (SharkState::cache_after_Java_call): Likewise. (SharkState::decache_for_VM_call): Likewise. (SharkState::cache_after_VM_call): Likewise. (SharkState::decache_for_trap): Likewise. (SharkEntryState::SharkEntryState): Don't load initial local variables directly, populate the state with dummy values and use a SharkFunctionEntryCacher to perform the loads. * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp (SharkCacherDecacher::SharkCacherDecacher): Remove bci argument, and add frame cache argument. (SharkCacherDecacher::_frame_cache): New field. (SharkCacherDecacher::frame_cache): New method. (SharkCacherDecacher::_bci): Removed field. (SharkCacherDecacher::bci): Removed method. (SharkDecacher::SharkDecacher): Add frame cache argument. (SharkDecacher::_bci): New field. (SharkDecacher::bci): New method. (SharkDecacher::write_value_to_frame): New method. (SharkJavaCallDecacher::SharkJavaCallDecacher): Add frame cache. (SharkVMCallDecacher::SharkVMCallDecacher): Likewise. (SharkTrapDecacher::SharkTrapDecacher): Likewise. (SharkCacher::SharkCacher): Likewise. (SharkDecacher::process_method_slot): Made virtual. (SharkDecacher::local_slot_needs_read): Likewise. (SharkDecacher::read_value_from_frame): New method. (SharkJavaCallCacher::SharkJavaCallDecacher): Add frame cache. (SharkVMCallCacher::SharkVMCallDecacher): Likewise. (SharkFunctionEntryCacher): New class. * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp (SharkDecacher::process_stack_slot): Use write_value_to_frame. (SharkDecacher::process_method_slot): Likewise. (SharkDecacher::process_local_slot): Likewise. (SharkCacher::process_stack_slot): Use read_value_from_frame. (SharkCacher::process_method_slot): Likewise. (SharkCacher::process_local_slot): Likewise. (SharkFunctionEntryCacher::process_method_slot): New method. (SharkDecacher::write_value_to_frame): Likewise. (SharkDecacher::read_value_from_frame): Likewise. * ports/hotspot/src/share/vm/includeDB_shark: Updated. diffstat: 10 files changed, 412 insertions(+), 99 deletions(-) ChangeLog | 65 ++++++++ ports/hotspot/src/share/vm/includeDB_shark | 13 + ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 67 +++++--- ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 126 ++++++++++++---- ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp | 66 ++++++++ ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp | 66 ++++++++ ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 6 ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 8 - ports/hotspot/src/share/vm/shark/sharkState.cpp | 73 +++++---- ports/hotspot/src/share/vm/shark/sharkState.hpp | 21 +- diffs (truncated from 868 to 500 lines): diff -r afe7df786dd4 -r 34524a71ee10 ChangeLog --- a/ChangeLog Thu Apr 30 16:31:55 2009 -0400 +++ b/ChangeLog Fri May 01 05:17:26 2009 -0400 @@ -1,3 +1,68 @@ 2009-04-30 Deepak Bhole + + * ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file. + * ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp: Likewise. + + * ports/hotspot/src/share/vm/shark/sharkFunction.hpp + (SharkFunction::_oopmap_frame_size): Removed field. + (SharkFunction::_extended_frame_size): New field. + (SharkFunction::extended_frame_size): New method. + (SharkFunction::oopmap_frame_size): Updated for the above. + * ports/hotspot/src/share/vm/shark/sharkFunction.cpp + (SharkFunction::CreateBuildFrame): Likewise. + + * ports/hotspot/src/share/vm/shark/sharkState.hpp + (SharkState::SharkState): Remove optional method argument. + (SharkState::_frame_cache): New field. + (SharkState::frame_cache): New method. + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkState::SharkState): Remove optional method argument. + (SharkState::initialize): Initialize frame cache. + (SharkState::equal_to): Compare frame cache. + (SharkState::merge): Merge frame cache. + (SharkState::decache_for_Java_call): Pass frame cache. + (SharkState::cache_after_Java_call): Likewise. + (SharkState::decache_for_VM_call): Likewise. + (SharkState::cache_after_VM_call): Likewise. + (SharkState::decache_for_trap): Likewise. + (SharkEntryState::SharkEntryState): Don't load initial local + variables directly, populate the state with dummy values and + use a SharkFunctionEntryCacher to perform the loads. + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp + (SharkCacherDecacher::SharkCacherDecacher): Remove bci argument, + and add frame cache argument. + (SharkCacherDecacher::_frame_cache): New field. + (SharkCacherDecacher::frame_cache): New method. + (SharkCacherDecacher::_bci): Removed field. + (SharkCacherDecacher::bci): Removed method. + (SharkDecacher::SharkDecacher): Add frame cache argument. + (SharkDecacher::_bci): New field. + (SharkDecacher::bci): New method. + (SharkDecacher::write_value_to_frame): New method. + (SharkJavaCallDecacher::SharkJavaCallDecacher): Add frame cache. + (SharkVMCallDecacher::SharkVMCallDecacher): Likewise. + (SharkTrapDecacher::SharkTrapDecacher): Likewise. + (SharkCacher::SharkCacher): Likewise. + (SharkDecacher::process_method_slot): Made virtual. + (SharkDecacher::local_slot_needs_read): Likewise. + (SharkDecacher::read_value_from_frame): New method. + (SharkJavaCallCacher::SharkJavaCallDecacher): Add frame cache. + (SharkVMCallCacher::SharkVMCallDecacher): Likewise. + (SharkFunctionEntryCacher): New class. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkDecacher::process_stack_slot): Use write_value_to_frame. + (SharkDecacher::process_method_slot): Likewise. + (SharkDecacher::process_local_slot): Likewise. + (SharkCacher::process_stack_slot): Use read_value_from_frame. + (SharkCacher::process_method_slot): Likewise. + (SharkCacher::process_local_slot): Likewise. + (SharkFunctionEntryCacher::process_method_slot): New method. + (SharkDecacher::write_value_to_frame): Likewise. + (SharkDecacher::read_value_from_frame): Likewise. + + * ports/hotspot/src/share/vm/includeDB_shark: Updated. + 2009-04-30 Deepak Bhole * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Forgo diff -r afe7df786dd4 -r 34524a71ee10 ports/hotspot/src/share/vm/includeDB_shark --- a/ports/hotspot/src/share/vm/includeDB_shark Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/includeDB_shark Fri May 01 05:17:26 2009 -0400 @@ -117,12 +117,14 @@ sharkCacheDecache.cpp sharkCacheDecache.cpp llvmValue.hpp sharkCacheDecache.cpp sharkBuilder.hpp sharkCacheDecache.cpp sharkCacheDecache.hpp +sharkCacheDecache.cpp sharkFrameCache.hpp sharkCacheDecache.cpp sharkFunction.hpp sharkCacheDecache.cpp sharkState.inline.hpp sharkCacheDecache.hpp ciMethod.hpp sharkCacheDecache.hpp debugInfoRec.hpp sharkCacheDecache.hpp sharkBuilder.hpp +sharkCacheDecache.hpp sharkFrameCache.hpp sharkCacheDecache.hpp sharkFunction.hpp sharkCacheDecache.hpp sharkStateScanner.hpp @@ -173,6 +175,15 @@ sharkEntry.cpp sharkEntry.hpp llvmHeaders.hpp +sharkFrameCache.cpp allocation.hpp +sharkFrameCache.cpp llvmHeaders.hpp +sharkFrameCache.cpp sharkFrameCache.hpp +sharkFrameCache.cpp sharkFunction.hpp + +sharkFrameCache.hpp allocation.hpp +sharkFrameCache.hpp llvmHeaders.hpp +sharkFrameCache.hpp sharkFunction.hpp + sharkFunction.cpp allocation.hpp sharkFunction.cpp ciTypeFlow.hpp sharkFunction.cpp debug.hpp @@ -263,6 +274,7 @@ sharkState.cpp sharkState.cpp ciTypeFlow.hpp sharkState.cpp sharkBuilder.hpp sharkState.cpp sharkCacheDecache.hpp +sharkState.cpp sharkFrameCache.hpp sharkState.cpp sharkState.inline.hpp sharkState.cpp sharkTopLevelBlock.hpp sharkState.cpp sharkType.hpp @@ -272,6 +284,7 @@ sharkState.hpp sharkState.hpp ciMethod.hpp sharkState.hpp llvmHeaders.hpp sharkState.hpp sharkBuilder.hpp +sharkState.hpp sharkFrameCache.hpp sharkState.hpp sharkValue.hpp sharkState.inline.hpp sharkBlock.hpp diff -r afe7df786dd4 -r 34524a71ee10 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Fri May 01 05:17:26 2009 -0400 @@ -59,11 +59,10 @@ void SharkDecacher::process_stack_slot(i // Write the value to the frame if necessary if (stack_slot_needs_write(index, value)) { - builder()->CreateStore( + write_value_to_frame( + SharkType::to_stackType(value->basic_type()), value->generic_value(), - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))); + adjusted_offset(value, offset)); } // Record the value in the oopmap if necessary @@ -104,11 +103,11 @@ void SharkDecacher::process_method_slot( void SharkDecacher::process_method_slot(llvm::Value** value, int offset) { // Decache the method pointer - builder()->CreateStore( + write_value_to_frame( + SharkType::methodOop_type(), *value, - function()->CreateAddressOfFrameEntry( - offset, - SharkType::methodOop_type())); + offset); + oopmap()->set_oop(slot2reg(offset)); } @@ -134,11 +133,10 @@ void SharkDecacher::process_local_slot(i // Write the value to the frame if necessary if (local_slot_needs_write(index, value)) { - builder()->CreateStore( + write_value_to_frame( + SharkType::to_stackType(value->basic_type()), value->generic_value(), - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))); + adjusted_offset(value, offset)); } // Record the value in the oopmap if necessary @@ -177,10 +175,9 @@ void SharkCacher::process_stack_slot(int if (stack_slot_needs_read(index, value)) { *addr = SharkValue::create_generic( value->type(), - builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))), + read_value_from_frame( + SharkType::to_stackType(value->basic_type()), + adjusted_offset(value, offset)), value->zero_checked()); } } @@ -188,10 +185,14 @@ void SharkCacher::process_method_slot(ll void SharkCacher::process_method_slot(llvm::Value** value, int offset) { // Cache the method pointer - *value = builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - offset, - SharkType::methodOop_type())); + *value = read_value_from_frame(SharkType::methodOop_type(), offset); +} + +void SharkFunctionEntryCacher::process_method_slot(llvm::Value** value, + int offset) +{ + // "Cache" the method pointer + *value = method(); } void SharkCacher::process_local_slot(int index, @@ -204,10 +205,28 @@ void SharkCacher::process_local_slot(int if (local_slot_needs_read(index, value)) { *addr = SharkValue::create_generic( value->type(), - builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))), + read_value_from_frame( + SharkType::to_stackType(value->basic_type()), + adjusted_offset(value, offset)), value->zero_checked()); } } + +void SharkDecacher::write_value_to_frame(const llvm::Type* type, + llvm::Value* value, + int offset) +{ + if (frame_cache()->value(offset) != value) { + builder()->CreateStore( + value, + function()->CreateAddressOfFrameEntry(offset, type)); + } +} + +Value* SharkCacher::read_value_from_frame(const llvm::Type* type, int offset) +{ + Value *result = builder()->CreateLoad( + function()->CreateAddressOfFrameEntry(offset, type)); + frame_cache()->set_value(offset, result); + return result; +} diff -r afe7df786dd4 -r 34524a71ee10 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Fri May 01 05:17:26 2009 -0400 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 Red Hat, Inc. + * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,26 +33,27 @@ // - SharkCacher // - SharkJavaCallCacher // - SharkVMCallCacher +// - SharkFunctionEntryCacher class SharkCacherDecacher : public SharkStateScanner { protected: - SharkCacherDecacher(SharkFunction* function, int bci) - : SharkStateScanner(function), _bci(bci) {} + SharkCacherDecacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkStateScanner(function), _frame_cache(frame_cache) {} + + private: + SharkFrameCache* _frame_cache; + + protected: + SharkFrameCache* frame_cache() const + { + return _frame_cache; + } protected: SharkBuilder* builder() const { return function()->builder(); } - - private: - int _bci; - - protected: - int bci() const - { - return _bci; - } // Helper protected: @@ -66,8 +67,17 @@ class SharkCacherDecacher : public Shark class SharkDecacher : public SharkCacherDecacher { protected: - SharkDecacher(SharkFunction* function, int bci) - : SharkCacherDecacher(function, bci) {} + SharkDecacher(SharkFunction* function, SharkFrameCache* frame_cache, int bci) + : SharkCacherDecacher(function, frame_cache), _bci(bci) {} + + private: + int _bci; + + protected: + int bci() const + { + return _bci; + } private: DebugInformationRecorder* debug_info() const @@ -171,12 +181,21 @@ class SharkDecacher : public SharkCacher return Location::normal; return Location::invalid; } + + // Writer helper + protected: + void write_value_to_frame(const llvm::Type* type, + llvm::Value* value, + int offset); }; class SharkJavaCallDecacher : public SharkDecacher { public: - SharkJavaCallDecacher(SharkFunction* function, int bci, ciMethod* callee) - : SharkDecacher(function, bci), _callee(callee) {} + SharkJavaCallDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci, + ciMethod* callee) + : SharkDecacher(function, frame_cache, bci), _callee(callee) {} private: ciMethod* _callee; @@ -220,8 +239,10 @@ class SharkJavaCallDecacher : public Sha class SharkVMCallDecacher : public SharkDecacher { public: - SharkVMCallDecacher(SharkFunction* function, int bci) - : SharkDecacher(function, bci) {} + SharkVMCallDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci) + : SharkDecacher(function, frame_cache, bci) {} // Stack slot helpers protected: @@ -256,8 +277,10 @@ class SharkVMCallDecacher : public Shark class SharkTrapDecacher : public SharkDecacher { public: - SharkTrapDecacher(SharkFunction* function, int bci) - : SharkDecacher(function, bci) {} + SharkTrapDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci) + : SharkDecacher(function, frame_cache, bci) {} // Stack slot helpers protected: @@ -292,14 +315,14 @@ class SharkTrapDecacher : public SharkDe class SharkCacher : public SharkCacherDecacher { protected: - SharkCacher(SharkFunction* function, int bci) - : SharkCacherDecacher(function, bci) {} + SharkCacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkCacherDecacher(function, frame_cache) {} // Callbacks protected: void process_stack_slot(int index, SharkValue** value, int offset); - void process_method_slot(llvm::Value** value, int offset); + virtual void process_method_slot(llvm::Value** value, int offset); void process_local_slot(int index, SharkValue** value, int offset); @@ -309,16 +332,22 @@ class SharkCacher : public SharkCacherDe // Local slot helper protected: - bool local_slot_needs_read(int index, SharkValue* value) - { - return value && value->is_jobject(); - } + virtual bool local_slot_needs_read(int index, SharkValue* value) + { + return value && value->is_jobject(); + } + + // Writer helper + protected: + llvm::Value* read_value_from_frame(const llvm::Type* type, int offset); }; class SharkJavaCallCacher : public SharkCacher { public: - SharkJavaCallCacher(SharkFunction* function, int bci, ciMethod* callee) - : SharkCacher(function, bci), _callee(callee) {} + SharkJavaCallCacher(SharkFunction* function, + SharkFrameCache* frame_cache, + ciMethod* callee) + : SharkCacher(function, frame_cache), _callee(callee) {} private: ciMethod* _callee; @@ -340,8 +369,8 @@ class SharkJavaCallCacher : public Shark class SharkVMCallCacher : public SharkCacher { public: - SharkVMCallCacher(SharkFunction* function, int bci) - : SharkCacher(function, bci) {} + SharkVMCallCacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkCacher(function, frame_cache) {} // Stack slot helper protected: @@ -350,3 +379,38 @@ class SharkVMCallCacher : public SharkCa return value && value->is_jobject(); } }; + +class SharkFunctionEntryCacher : public SharkCacher { + public: + SharkFunctionEntryCacher(SharkFunction* function, + SharkFrameCache* frame_cache, + llvm::Value* method) + : SharkCacher(function, frame_cache), _method(method) {} + + private: + llvm::Value* _method; + + private: + llvm::Value* method() const + { + return _method; + } + + // Method slot callback + protected: + void process_method_slot(llvm::Value** value, int offset); + + // Stack slot helper + protected: + bool stack_slot_needs_read(int index, SharkValue* value) + { + ShouldNotReachHere(); // entry block shouldn't have stack + } + + // Local slot helper + protected: + virtual bool local_slot_needs_read(int index, SharkValue* value) + { + return value != NULL; + } +}; diff -r afe7df786dd4 -r 34524a71ee10 ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp Fri May 01 05:17:26 2009 -0400 @@ -0,0 +1,66 @@ +/* + * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2009 Red Hat, Inc. + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + +#include "incls/_precompiled.incl" +#include "incls/_sharkFrameCache.cpp.incl" + +using namespace llvm; + +SharkFrameCache::SharkFrameCache(SharkFunction *function) + : _frame_size(function->extended_frame_size()) +{ + _values = NEW_RESOURCE_ARRAY(Value*, frame_size()); + memset(_values, 0, frame_size() * sizeof(Value *)); +} + +SharkFrameCache::SharkFrameCache(const SharkFrameCache* cache) + : _frame_size(cache->frame_size()) +{ + _values = NEW_RESOURCE_ARRAY(Value*, frame_size()); + memcpy(_values, cache->_values, frame_size() * sizeof(Value *)); From gbenson at redhat.com Fri May 1 02:39:10 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 1 May 2009 10:39:10 +0100 Subject: Shark frame cache Message-ID: <20090501093910.GA3244@redhat.com> Hi all, When Shark drops into HotSpot code it needs to dump all live object pointers to the stack, and when it returns it needs to load them all back. This is probably THE number one performance handicap in Shark. This patch allows Shark to omit a bunch of the writes, which makes most SPECjvm98 benchmarks faster (mtrt by 12%!) (times not produced in compliance with the SPECjvm98 run rules and so not comparable with SPECjvm98 metrics). It's quite a fiddly patch, but what it does is pretty straightforward: * Firstly, it creates a new cacher, SharkFunctionEntryCacher, to do the initial load of the function's arguments into registers. This funnels all access to the stack frame through the Cache-Decache code, and is a nice simplification as all the tricky frame-offset calculation is now in one place. * Secondly, it funnels all loads and stores in the Cache-Decache code through read_value_from_frame and write_value_to_frame. * read_value_from_frame stores the values it reads in the frame cache. This is propagated around the method being compiled by the same code that does local variables, stack slots, etc. When write_value_to_frame comes to write things, it compares the value it's writing with the frame cache entry for the slot it's writing to. If they're the same the write is unnecessary. LLVM is SSA, so this is a simple pointer comparison. Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r afe7df786dd4 ChangeLog --- a/ChangeLog Thu Apr 30 16:31:55 2009 -0400 +++ b/ChangeLog Fri May 01 05:17:00 2009 -0400 @@ -1,3 +1,68 @@ +2009-05-01 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file. + * ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp: Likewise. + + * ports/hotspot/src/share/vm/shark/sharkFunction.hpp + (SharkFunction::_oopmap_frame_size): Removed field. + (SharkFunction::_extended_frame_size): New field. + (SharkFunction::extended_frame_size): New method. + (SharkFunction::oopmap_frame_size): Updated for the above. + * ports/hotspot/src/share/vm/shark/sharkFunction.cpp + (SharkFunction::CreateBuildFrame): Likewise. + + * ports/hotspot/src/share/vm/shark/sharkState.hpp + (SharkState::SharkState): Remove optional method argument. + (SharkState::_frame_cache): New field. + (SharkState::frame_cache): New method. + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkState::SharkState): Remove optional method argument. + (SharkState::initialize): Initialize frame cache. + (SharkState::equal_to): Compare frame cache. + (SharkState::merge): Merge frame cache. + (SharkState::decache_for_Java_call): Pass frame cache. + (SharkState::cache_after_Java_call): Likewise. + (SharkState::decache_for_VM_call): Likewise. + (SharkState::cache_after_VM_call): Likewise. + (SharkState::decache_for_trap): Likewise. + (SharkEntryState::SharkEntryState): Don't load initial local + variables directly, populate the state with dummy values and + use a SharkFunctionEntryCacher to perform the loads. + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp + (SharkCacherDecacher::SharkCacherDecacher): Remove bci argument, + and add frame cache argument. + (SharkCacherDecacher::_frame_cache): New field. + (SharkCacherDecacher::frame_cache): New method. + (SharkCacherDecacher::_bci): Removed field. + (SharkCacherDecacher::bci): Removed method. + (SharkDecacher::SharkDecacher): Add frame cache argument. + (SharkDecacher::_bci): New field. + (SharkDecacher::bci): New method. + (SharkDecacher::write_value_to_frame): New method. + (SharkJavaCallDecacher::SharkJavaCallDecacher): Add frame cache. + (SharkVMCallDecacher::SharkVMCallDecacher): Likewise. + (SharkTrapDecacher::SharkTrapDecacher): Likewise. + (SharkCacher::SharkCacher): Likewise. + (SharkDecacher::process_method_slot): Made virtual. + (SharkDecacher::local_slot_needs_read): Likewise. + (SharkDecacher::read_value_from_frame): New method. + (SharkJavaCallCacher::SharkJavaCallDecacher): Add frame cache. + (SharkVMCallCacher::SharkVMCallDecacher): Likewise. + (SharkFunctionEntryCacher): New class. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkDecacher::process_stack_slot): Use write_value_to_frame. + (SharkDecacher::process_method_slot): Likewise. + (SharkDecacher::process_local_slot): Likewise. + (SharkCacher::process_stack_slot): Use read_value_from_frame. + (SharkCacher::process_method_slot): Likewise. + (SharkCacher::process_local_slot): Likewise. + (SharkFunctionEntryCacher::process_method_slot): New method. + (SharkDecacher::write_value_to_frame): Likewise. + (SharkDecacher::read_value_from_frame): Likewise. + + * ports/hotspot/src/share/vm/includeDB_shark: Updated. + 2009-04-30 Deepak Bhole * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Forgo diff -r afe7df786dd4 ports/hotspot/src/share/vm/includeDB_shark --- a/ports/hotspot/src/share/vm/includeDB_shark Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/includeDB_shark Fri May 01 05:17:00 2009 -0400 @@ -117,12 +117,14 @@ sharkCacheDecache.cpp llvmValue.hpp sharkCacheDecache.cpp sharkBuilder.hpp sharkCacheDecache.cpp sharkCacheDecache.hpp +sharkCacheDecache.cpp sharkFrameCache.hpp sharkCacheDecache.cpp sharkFunction.hpp sharkCacheDecache.cpp sharkState.inline.hpp sharkCacheDecache.hpp ciMethod.hpp sharkCacheDecache.hpp debugInfoRec.hpp sharkCacheDecache.hpp sharkBuilder.hpp +sharkCacheDecache.hpp sharkFrameCache.hpp sharkCacheDecache.hpp sharkFunction.hpp sharkCacheDecache.hpp sharkStateScanner.hpp @@ -172,6 +174,15 @@ sharkEntry.cpp sharkEntry.hpp sharkEntry.hpp llvmHeaders.hpp + +sharkFrameCache.cpp allocation.hpp +sharkFrameCache.cpp llvmHeaders.hpp +sharkFrameCache.cpp sharkFrameCache.hpp +sharkFrameCache.cpp sharkFunction.hpp + +sharkFrameCache.hpp allocation.hpp +sharkFrameCache.hpp llvmHeaders.hpp +sharkFrameCache.hpp sharkFunction.hpp sharkFunction.cpp allocation.hpp sharkFunction.cpp ciTypeFlow.hpp @@ -263,6 +274,7 @@ sharkState.cpp ciTypeFlow.hpp sharkState.cpp sharkBuilder.hpp sharkState.cpp sharkCacheDecache.hpp +sharkState.cpp sharkFrameCache.hpp sharkState.cpp sharkState.inline.hpp sharkState.cpp sharkTopLevelBlock.hpp sharkState.cpp sharkType.hpp @@ -272,6 +284,7 @@ sharkState.hpp ciMethod.hpp sharkState.hpp llvmHeaders.hpp sharkState.hpp sharkBuilder.hpp +sharkState.hpp sharkFrameCache.hpp sharkState.hpp sharkValue.hpp sharkState.inline.hpp sharkBlock.hpp diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Fri May 01 05:17:00 2009 -0400 @@ -59,11 +59,10 @@ // Write the value to the frame if necessary if (stack_slot_needs_write(index, value)) { - builder()->CreateStore( + write_value_to_frame( + SharkType::to_stackType(value->basic_type()), value->generic_value(), - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))); + adjusted_offset(value, offset)); } // Record the value in the oopmap if necessary @@ -104,11 +103,11 @@ void SharkDecacher::process_method_slot(llvm::Value** value, int offset) { // Decache the method pointer - builder()->CreateStore( + write_value_to_frame( + SharkType::methodOop_type(), *value, - function()->CreateAddressOfFrameEntry( - offset, - SharkType::methodOop_type())); + offset); + oopmap()->set_oop(slot2reg(offset)); } @@ -134,11 +133,10 @@ // Write the value to the frame if necessary if (local_slot_needs_write(index, value)) { - builder()->CreateStore( + write_value_to_frame( + SharkType::to_stackType(value->basic_type()), value->generic_value(), - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))); + adjusted_offset(value, offset)); } // Record the value in the oopmap if necessary @@ -177,10 +175,9 @@ if (stack_slot_needs_read(index, value)) { *addr = SharkValue::create_generic( value->type(), - builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))), + read_value_from_frame( + SharkType::to_stackType(value->basic_type()), + adjusted_offset(value, offset)), value->zero_checked()); } } @@ -188,10 +185,14 @@ void SharkCacher::process_method_slot(llvm::Value** value, int offset) { // Cache the method pointer - *value = builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - offset, - SharkType::methodOop_type())); + *value = read_value_from_frame(SharkType::methodOop_type(), offset); +} + +void SharkFunctionEntryCacher::process_method_slot(llvm::Value** value, + int offset) +{ + // "Cache" the method pointer + *value = method(); } void SharkCacher::process_local_slot(int index, @@ -204,10 +205,28 @@ if (local_slot_needs_read(index, value)) { *addr = SharkValue::create_generic( value->type(), - builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))), + read_value_from_frame( + SharkType::to_stackType(value->basic_type()), + adjusted_offset(value, offset)), value->zero_checked()); } } + +void SharkDecacher::write_value_to_frame(const llvm::Type* type, + llvm::Value* value, + int offset) +{ + if (frame_cache()->value(offset) != value) { + builder()->CreateStore( + value, + function()->CreateAddressOfFrameEntry(offset, type)); + } +} + +Value* SharkCacher::read_value_from_frame(const llvm::Type* type, int offset) +{ + Value *result = builder()->CreateLoad( + function()->CreateAddressOfFrameEntry(offset, type)); + frame_cache()->set_value(offset, result); + return result; +} diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Fri May 01 05:17:00 2009 -0400 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 Red Hat, Inc. + * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,26 +33,27 @@ // - SharkCacher // - SharkJavaCallCacher // - SharkVMCallCacher +// - SharkFunctionEntryCacher class SharkCacherDecacher : public SharkStateScanner { protected: - SharkCacherDecacher(SharkFunction* function, int bci) - : SharkStateScanner(function), _bci(bci) {} + SharkCacherDecacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkStateScanner(function), _frame_cache(frame_cache) {} + + private: + SharkFrameCache* _frame_cache; + + protected: + SharkFrameCache* frame_cache() const + { + return _frame_cache; + } protected: SharkBuilder* builder() const { return function()->builder(); } - - private: - int _bci; - - protected: - int bci() const - { - return _bci; - } // Helper protected: @@ -66,8 +67,17 @@ class SharkDecacher : public SharkCacherDecacher { protected: - SharkDecacher(SharkFunction* function, int bci) - : SharkCacherDecacher(function, bci) {} + SharkDecacher(SharkFunction* function, SharkFrameCache* frame_cache, int bci) + : SharkCacherDecacher(function, frame_cache), _bci(bci) {} + + private: + int _bci; + + protected: + int bci() const + { + return _bci; + } private: DebugInformationRecorder* debug_info() const @@ -171,12 +181,21 @@ return Location::normal; return Location::invalid; } + + // Writer helper + protected: + void write_value_to_frame(const llvm::Type* type, + llvm::Value* value, + int offset); }; class SharkJavaCallDecacher : public SharkDecacher { public: - SharkJavaCallDecacher(SharkFunction* function, int bci, ciMethod* callee) - : SharkDecacher(function, bci), _callee(callee) {} + SharkJavaCallDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci, + ciMethod* callee) + : SharkDecacher(function, frame_cache, bci), _callee(callee) {} private: ciMethod* _callee; @@ -220,8 +239,10 @@ class SharkVMCallDecacher : public SharkDecacher { public: - SharkVMCallDecacher(SharkFunction* function, int bci) - : SharkDecacher(function, bci) {} + SharkVMCallDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci) + : SharkDecacher(function, frame_cache, bci) {} // Stack slot helpers protected: @@ -256,8 +277,10 @@ class SharkTrapDecacher : public SharkDecacher { public: - SharkTrapDecacher(SharkFunction* function, int bci) - : SharkDecacher(function, bci) {} + SharkTrapDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci) + : SharkDecacher(function, frame_cache, bci) {} // Stack slot helpers protected: @@ -292,14 +315,14 @@ class SharkCacher : public SharkCacherDecacher { protected: - SharkCacher(SharkFunction* function, int bci) - : SharkCacherDecacher(function, bci) {} + SharkCacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkCacherDecacher(function, frame_cache) {} // Callbacks protected: void process_stack_slot(int index, SharkValue** value, int offset); - void process_method_slot(llvm::Value** value, int offset); + virtual void process_method_slot(llvm::Value** value, int offset); void process_local_slot(int index, SharkValue** value, int offset); @@ -309,16 +332,22 @@ // Local slot helper protected: - bool local_slot_needs_read(int index, SharkValue* value) + virtual bool local_slot_needs_read(int index, SharkValue* value) { return value && value->is_jobject(); } + + // Writer helper + protected: + llvm::Value* read_value_from_frame(const llvm::Type* type, int offset); }; class SharkJavaCallCacher : public SharkCacher { public: - SharkJavaCallCacher(SharkFunction* function, int bci, ciMethod* callee) - : SharkCacher(function, bci), _callee(callee) {} + SharkJavaCallCacher(SharkFunction* function, + SharkFrameCache* frame_cache, + ciMethod* callee) + : SharkCacher(function, frame_cache), _callee(callee) {} private: ciMethod* _callee; @@ -340,8 +369,8 @@ class SharkVMCallCacher : public SharkCacher { public: - SharkVMCallCacher(SharkFunction* function, int bci) - : SharkCacher(function, bci) {} + SharkVMCallCacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkCacher(function, frame_cache) {} // Stack slot helper protected: @@ -350,3 +379,38 @@ return value && value->is_jobject(); } }; + +class SharkFunctionEntryCacher : public SharkCacher { + public: + SharkFunctionEntryCacher(SharkFunction* function, + SharkFrameCache* frame_cache, + llvm::Value* method) + : SharkCacher(function, frame_cache), _method(method) {} + + private: + llvm::Value* _method; + + private: + llvm::Value* method() const + { + return _method; + } + + // Method slot callback + protected: + void process_method_slot(llvm::Value** value, int offset); + + // Stack slot helper + protected: + bool stack_slot_needs_read(int index, SharkValue* value) + { + ShouldNotReachHere(); // entry block shouldn't have stack + } + + // Local slot helper + protected: + virtual bool local_slot_needs_read(int index, SharkValue* value) + { + return value != NULL; + } +}; diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp Fri May 01 05:17:00 2009 -0400 @@ -0,0 +1,66 @@ +/* + * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2009 Red Hat, Inc. + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + +#include "incls/_precompiled.incl" +#include "incls/_sharkFrameCache.cpp.incl" + +using namespace llvm; + +SharkFrameCache::SharkFrameCache(SharkFunction *function) + : _frame_size(function->extended_frame_size()) +{ + _values = NEW_RESOURCE_ARRAY(Value*, frame_size()); + memset(_values, 0, frame_size() * sizeof(Value *)); +} + +SharkFrameCache::SharkFrameCache(const SharkFrameCache* cache) + : _frame_size(cache->frame_size()) +{ + _values = NEW_RESOURCE_ARRAY(Value*, frame_size()); + memcpy(_values, cache->_values, frame_size() * sizeof(Value *)); +} + +bool SharkFrameCache::equal_to(SharkFrameCache* other) +{ + if (frame_size() != other->frame_size()) + return false; + + for (int i = 0; i < frame_size(); i++) { + if (value(i) != other->value(i)) + return false; + } + + return true; +} + +void SharkFrameCache::merge(SharkFrameCache* other) +{ + assert(frame_size() == other->frame_size(), "should be"); + + for (int i = 0; i < frame_size(); i++) { + if (value(i) != other->value(i)) + set_value(i, NULL); + } +} diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp Fri May 01 05:17:00 2009 -0400 @@ -0,0 +1,66 @@ +/* + * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2009 Red Hat, Inc. + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + +class SharkFrameCache : public ResourceObj { + public: + SharkFrameCache(SharkFunction* function); + + protected: + SharkFrameCache(const SharkFrameCache* cache); + + private: + int _frame_size; + llvm::Value** _values; + + private: + int frame_size() const + { + return _frame_size; + } + + public: + llvm::Value* value(int slot) + { + assert(slot >= 0 && slot < frame_size(), "bad index"); + return _values[slot]; + } + void set_value(int slot, llvm::Value* value) + { + assert(slot >= 0 && slot < frame_size(), "bad index"); + _values[slot] = value; + } + + // Comparison + public: + bool equal_to(SharkFrameCache* other); + + // Copy and merge + public: + SharkFrameCache *copy() const + { + return new SharkFrameCache(this); + } + void merge(SharkFrameCache* other); +}; diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkFunction.cpp --- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Fri May 01 05:17:00 2009 -0400 @@ -220,7 +220,7 @@ int stack_words = max_stack(); int frame_words = header_words + monitor_words + stack_words; - _oopmap_frame_size = frame_words + extra_locals; + _extended_frame_size = frame_words + locals_words; // Update the stack pointer Value *zero_stack_pointer = builder()->CreateSub( @@ -233,7 +233,7 @@ _frame = builder()->CreateIntToPtr( zero_stack_pointer, PointerType::getUnqual( - ArrayType::get(SharkType::intptr_type(), frame_words + locals_words)), + ArrayType::get(SharkType::intptr_type(), extended_frame_size())), "frame"); int offset = 0; @@ -277,7 +277,7 @@ _locals_slots_offset = offset; offset += locals_words; - assert(offset == frame_words + locals_words, "should do"); + assert(offset == extended_frame_size(), "should do"); return fp; } diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkFunction.hpp --- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Fri May 01 05:17:00 2009 -0400 @@ -253,7 +253,7 @@ } private: - int _oopmap_frame_size; + int _extended_frame_size; int _stack_slots_offset; int _monitors_slots_offset; int _exception_slot_offset; @@ -262,9 +262,13 @@ int _locals_slots_offset; public: + int extended_frame_size() const + { + return _extended_frame_size; + } int oopmap_frame_size() const { - return _oopmap_frame_size; + return extended_frame_size() - arg_size(); } int stack_slots_offset() const { diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkState.cpp --- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Fri May 01 05:17:00 2009 -0400 @@ -28,12 +28,11 @@ using namespace llvm; -SharkState::SharkState(SharkBlock* block, - SharkFunction* function, - llvm::Value* method) +SharkState::SharkState(SharkBlock* block, SharkFunction* function) : _block(block), _function(function), - _method(method) + _method(NULL), + _frame_cache(NULL) { initialize(NULL); } @@ -41,7 +40,8 @@ SharkState::SharkState(SharkBlock* block, const SharkState* state) : _block(block), _function(state->function()), - _method(state->method()) + _method(state->method()), + _frame_cache(NULL) { initialize(state); } @@ -69,7 +69,13 @@ value = value->clone(); push(value); } + + if (state->frame_cache()) + _frame_cache = state->frame_cache()->copy(); } + else if (function()) { + _frame_cache = new SharkFrameCache(function()); + } } bool SharkState::equal_to(SharkState *other) @@ -89,6 +95,7 @@ if (stack_depth() != other->stack_depth()) return false; + // Local variables for (int i = 0; i < max_locals(); i++) { SharkValue *value = local(i); SharkValue *other_value = other->local(i); @@ -106,6 +113,7 @@ } } + // Expression stack for (int i = 0; i < stack_depth(); i++) { SharkValue *value = stack(i); SharkValue *other_value = other->stack(i); @@ -121,6 +129,19 @@ if (!value->equal_to(other_value)) return false; } + } + + // Frame cache + if (frame_cache() == NULL) { + if (other->frame_cache() != NULL) + return false; + } + else { + if (other->frame_cache() == NULL) + return false; + + if (!frame_cache()->equal_to(other->frame_cache())) + return false; } return true; @@ -167,12 +188,16 @@ builder(), other_value, other_block, this_block, name)); } } + + // Frame cache + frame_cache()->merge(other->frame_cache()); } void SharkState::decache_for_Java_call(ciMethod* callee) { assert(function() && method(), "you cannot decache here"); - SharkJavaCallDecacher(function(), block()->bci(), callee).scan(this); + SharkJavaCallDecacher( + function(), frame_cache(), block()->bci(), callee).scan(this); pop(callee->arg_size()); } @@ -197,31 +222,31 @@ if (type->is_two_word()) push(NULL); } - SharkJavaCallCacher(function(), block()->bci(), callee).scan(this); + SharkJavaCallCacher(function(), frame_cache(), callee).scan(this); } void SharkState::decache_for_VM_call() { assert(function() && method(), "you cannot decache here"); - SharkVMCallDecacher(function(), block()->bci()).scan(this); + SharkVMCallDecacher(function(), frame_cache(), block()->bci()).scan(this); } void SharkState::cache_after_VM_call() { assert(function() && method(), "you cannot cache here"); - SharkVMCallCacher(function(), block()->bci()).scan(this); + SharkVMCallCacher(function(), frame_cache()).scan(this); } void SharkState::decache_for_trap() { assert(function() && method(), "you cannot decache here"); - SharkTrapDecacher(function(), block()->bci()).scan(this); + SharkTrapDecacher(function(), frame_cache(), block()->bci()).scan(this); } SharkEntryState::SharkEntryState(SharkTopLevelBlock* block, Value* method) - : SharkState(block, block->function(), method) + : SharkState(block, block->function()) { - char name[18]; + assert(!block->stack_depth_at_entry(), "entry block shouldn't have stack"); // Local variables for (int i = 0; i < max_locals(); i++) { @@ -235,21 +260,11 @@ case T_DOUBLE: case T_OBJECT: case T_ARRAY: - if (i < function()->arg_size()) { - snprintf(name, sizeof(name), "local_%d_", i); - value = SharkValue::create_generic( - type, - builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - function()->locals_slots_offset() - + max_locals() - type->size() - i, - SharkType::to_stackType(type)), - name), - i == 0 && !function()->target()->is_static()); + if (i >= function()->arg_size()) { + ShouldNotReachHere(); } - else { - Unimplemented(); - } + value = SharkValue::create_generic( + type, NULL, i == 0 && !function()->target()->is_static()); break; case ciTypeFlow::StateVector::T_BOTTOM: @@ -264,9 +279,7 @@ } set_local(i, value); } - - // Expression stack - assert(!block->stack_depth_at_entry(), "entry block shouldn't have stack"); + SharkFunctionEntryCacher(function(), frame_cache(), method).scan(this); } SharkPHIState::SharkPHIState(SharkTopLevelBlock* block) diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkState.hpp --- a/ports/hotspot/src/share/vm/shark/sharkState.hpp Thu Apr 30 16:31:55 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkState.hpp Fri May 01 05:17:00 2009 -0400 @@ -29,21 +29,20 @@ class SharkState : public ResourceObj { public: - SharkState(SharkBlock* block, - SharkFunction* function = NULL, - llvm::Value* method = NULL); + SharkState(SharkBlock* block, SharkFunction* function = NULL); SharkState(SharkBlock* block, const SharkState* state); private: void initialize(const SharkState* state); private: - SharkBlock* _block; - SharkFunction* _function; - llvm::Value* _method; - SharkValue** _locals; - SharkValue** _stack; - SharkValue** _sp; + SharkBlock* _block; + SharkFunction* _function; + llvm::Value* _method; + SharkFrameCache* _frame_cache; + SharkValue** _locals; + SharkValue** _stack; + SharkValue** _sp; public: SharkBlock *block() const @@ -53,6 +52,10 @@ SharkFunction *function() const { return _function; + } + SharkFrameCache *frame_cache() const + { + return _frame_cache; } public: From langel at redhat.com Fri May 1 06:37:09 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 01 May 2009 09:37:09 -0400 Subject: Proposed IcedTea6-1.5 Release Message-ID: <49FAFB05.5030509@redhat.com> Hi, I would like to have a release in the new future, which includes the new b16 update and several important improvements to the plugin. Any objections or suggestions? Cheers, Lillian From mjw at redhat.com Fri May 1 07:55:18 2009 From: mjw at redhat.com (Mark Wielaard) Date: Fri, 01 May 2009 16:55:18 +0200 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <49FAFB05.5030509@redhat.com> References: <49FAFB05.5030509@redhat.com> Message-ID: <1241189725.4454.3.camel@hermans.wildebeest.org> On Fri, 2009-05-01 at 09:37 -0400, Lillian Angel wrote: > I would like to have a release in the new future, which includes the new > b16 update and several important improvements to the plugin. > > Any objections or suggestions? I am working on some small bugs/improvements to the new --enable-systemtap functionality that Andrew and Matthias pointed out, which, which I hope to get in by Monday. http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=328 --enable-systemtap is disabled by default, so it isn't a blocker, but it would be nice to have it working an as many setups as possible. Thanks, Mark From langel at redhat.com Fri May 1 09:25:21 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 01 May 2009 16:25:21 +0000 Subject: changeset in /hg/icedtea6: 2009-05-01 Lillian Angel changeset 868030b86280 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=868030b86280 description: 2009-05-01 Lillian Angel * HACKING: Updated. * Makefile.am: Updated to new b16 bundle. (ICEDTEA_PATCHES): Removed patches/icedtea-enum-bug-181.patch. * patches/icedtea-lcms.patch: Updated. Only includes a single patch for cmsxform.c. * patches/icedtea-enum-bug-181.patch: Removed. diffstat: 4 files changed, 27 insertions(+), 6454 deletions(-) ChangeLog | 9 HACKING | 3 Makefile.am | 5 patches/icedtea-lcms.patch | 6464 -------------------------------------------- diffs (truncated from 6558 to 500 lines): diff -r 34524a71ee10 -r 868030b86280 ChangeLog --- a/ChangeLog Fri May 01 05:17:26 2009 -0400 +++ b/ChangeLog Fri May 01 12:26:02 2009 -0400 @@ -1,3 +1,12 @@ 2009-05-01 Gary Benson + + * HACKING: Updated. + * Makefile.am: Updated to new b16 bundle. + (ICEDTEA_PATCHES): Removed patches/icedtea-enum-bug-181.patch. + * patches/icedtea-lcms.patch: Updated. Only includes a single patch + for cmsxform.c. + * patches/icedtea-enum-bug-181.patch: Removed. + 2009-05-01 Gary Benson * ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file. diff -r 34524a71ee10 -r 868030b86280 HACKING --- a/HACKING Fri May 01 05:17:26 2009 -0400 +++ b/HACKING Fri May 01 12:26:02 2009 -0400 @@ -22,7 +22,6 @@ The following patches are currently appl * icedtea-core-build.patch: Add support for building IcedTea core VM. * icedtea-debuginfo.patch: Add -g option to build to generate debugging information. * icedtea-demos.patch: Fix building of JVMTI demo. -* icedtea-enum-bug-181.patch: Fixes class type check (PR181/S6736248) * icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30) * icedtea-fonts.patch: Add Fedora fontconfig. * icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror. @@ -32,7 +31,7 @@ The following patches are currently appl * icedtea-javac-debuginfo.patch: Ensure debugging information is generated for all class files. * icedtea-javafiles.patch: Add missing Java files to list. * icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support. -* icedtea-lcms: Updates lcms to 1.18 and applies other security patches. +* icedtea-lcms: Applies security patch. * icedtea-lib64.patch: Add support for building on platforms with /usr/lib64. * icedtea-libraries.patch: Use system JPEG and zlib libraries. * icedtea-linker-options.patch: Add -Xlinker option when linking. diff -r 34524a71ee10 -r 868030b86280 Makefile.am --- a/Makefile.am Fri May 01 05:17:26 2009 -0400 +++ b/Makefile.am Fri May 01 12:26:02 2009 -0400 @@ -1,5 +1,5 @@ OPENJDK_DATE = 13_apr_2009 -OPENJDK_DATE = 13_apr_2009 -OPENJDK_MD5SUM = d395b4d4ac8b2aff70730b953f9e2736 +OPENJDK_DATE = 24_apr_2009 +OPENJDK_MD5SUM = 850a29b70206bc7fa083cd26acc781f3 OPENJDK_VERSION = b16 CACAO_VERSION = 0.99.4 @@ -580,7 +580,6 @@ ICEDTEA_PATCHES += \ patches/icedtea-nomotif.patch \ patches/icedtea-alpha-fixes.patch \ patches/icedtea-alt-jar.patch \ - patches/icedtea-enum-bug-181.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 \ diff -r 34524a71ee10 -r 868030b86280 patches/icedtea-lcms.patch --- a/patches/icedtea-lcms.patch Fri May 01 05:17:26 2009 -0400 +++ b/patches/icedtea-lcms.patch Fri May 01 12:26:02 2009 -0400 @@ -1,5507 +1,17 @@ diff -ruN openjdkold/jdk/src/share/nativ -diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c ---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2008-11-25 04:06:03.000000000 -0500 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2009-04-03 13:42:46.000000000 -0400 -@@ -29,7 +29,7 @@ - // - // - // Little cms --// Copyright (C) 1998-2006 Marti Maria -+// Copyright (C) 1998-2007 Marti Maria - // - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the "Software"), -@@ -51,7 +51,7 @@ - - - --// CIECAM 02 appearance model -+// CIECAM 02 appearance model. Many thanks to Jordi Vilar for the debugging. - - #include "lcms.h" - -@@ -196,6 +196,10 @@ - clr.RGBpa[i] = (400.0 * temp) / (temp + 27.13) + 0.1; - } - } -+ -+ clr.A = (((2.0 * clr.RGBpa[0]) + clr.RGBpa[1] + -+ (clr.RGBpa[2] / 20.0)) - 0.305) * pMod->Nbb; -+ - return clr; - } - -@@ -249,9 +253,6 @@ - clr.H = 300 + ((100*((clr.h - 237.53)/1.2)) / temp); - } - -- clr.A = (((2.0 * clr.RGBpa[0]) + clr.RGBpa[1] + -- (clr.RGBpa[2] / 20.0)) - 0.305) * pMod->Nbb; -- - clr.J = 100.0 * pow((clr.A / pMod->adoptedWhite.A), - (pMod->c * pMod->z)); - -@@ -395,7 +396,7 @@ - LPcmsCIECAM02 lpMod; - - -- if((lpMod = (LPcmsCIECAM02) malloc(sizeof(cmsCIECAM02))) == NULL) { -+ if((lpMod = (LPcmsCIECAM02) _cmsMalloc(sizeof(cmsCIECAM02))) == NULL) { - return (LCMSHANDLE) NULL; - } - -@@ -449,14 +450,19 @@ - lpMod -> z = compute_z(lpMod); - lpMod -> Nbb = computeNbb(lpMod); - lpMod -> FL = computeFL(lpMod); -+ -+ if (lpMod -> D == D_CALCULATE || -+ lpMod -> D == D_CALCULATE_DISCOUNT) { -+ - lpMod -> D = computeD(lpMod); -+ } -+ - lpMod -> Ncb = lpMod -> Nbb; - - lpMod -> adoptedWhite = XYZtoCAT02(lpMod -> adoptedWhite); - lpMod -> adoptedWhite = ChromaticAdaptation(lpMod -> adoptedWhite, lpMod); - lpMod -> adoptedWhite = CAT02toHPE(lpMod -> adoptedWhite); - lpMod -> adoptedWhite = NonlinearCompression(lpMod -> adoptedWhite, lpMod); -- lpMod -> adoptedWhite = ComputeCorrelates(lpMod -> adoptedWhite, lpMod); - - return (LCMSHANDLE) lpMod; - -@@ -465,7 +471,7 @@ - void LCMSEXPORT cmsCIECAM02Done(LCMSHANDLE hModel) - { - LPcmsCIECAM02 lpMod = (LPcmsCIECAM02) (LPSTR) hModel; -- if (lpMod) free(lpMod); -+ if (lpMod) _cmsFree(lpMod); - } - - -diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c ---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2008-11-25 04:06:03.000000000 -0500 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2009-04-03 13:42:46.000000000 -0400 -@@ -29,7 +29,7 @@ - // - // - // Little cms --// Copyright (C) 1998-2006 Marti Maria -+// Copyright (C) 1998-2007 Marti Maria - // - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the "Software"), -@@ -174,7 +174,7 @@ - LCMSAPI void LCMSEXPORT cmsCIECAM97sDone(LCMSHANDLE hModel) - { - LPcmsCIECAM97s lpMod = (LPcmsCIECAM97s) (LPSTR) hModel; -- if (lpMod) free(lpMod); -+ if (lpMod) _cmsFree(lpMod); - } - - // Partial discounting for adaptation degree computation -@@ -331,7 +331,7 @@ - LPcmsCIECAM97s lpMod; - VEC3 tmp; - -- if((lpMod = (LPcmsCIECAM97s) malloc(sizeof(cmsCIECAM97s))) == NULL) { -+ if((lpMod = (LPcmsCIECAM97s) _cmsMalloc(sizeof(cmsCIECAM97s))) == NULL) { - return (LCMSHANDLE) NULL; - } - -@@ -449,7 +449,7 @@ - - // RGB_subw = [MlamRigg][WP/YWp] - #ifdef USE_CIECAM97s2 -- MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, (LPVEC3) &lpMod -> WP); -+ MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &lpMod -> WP); - #else - VEC3divK(&tmp, (LPVEC3) &lpMod -> WP, lpMod->WP.Y); - MAT3eval(&lpMod -> RGB_subw, &lpMod -> MlamRigg, &tmp); -diff -ruN openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c ---- openjdkold/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2008-11-25 04:06:03.000000000 -0500 -+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2009-04-03 13:42:46.000000000 -0400 -@@ -29,7 +29,7 @@ - // - // - // Little cms --// Copyright (C) 1998-2006 Marti Maria -+// Copyright (C) 1998-2007 Marti Maria - // - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the "Software"), -@@ -65,22 +65,25 @@ - // Persistence - LCMSAPI LCMSHANDLE LCMSEXPORT cmsIT8LoadFromFile(const char* cFileName); - LCMSAPI LCMSHANDLE LCMSEXPORT cmsIT8LoadFromMem(void *Ptr, size_t len); --LCMSAPI BOOL LCMSEXPORT cmsIT8SaveToFile(LCMSHANDLE IT8, const char* cFileName); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SaveToFile(LCMSHANDLE IT8, const char* cFileName); - - // Properties - LCMSAPI const char* LCMSEXPORT cmsIT8GetSheetType(LCMSHANDLE hIT8); --LCMSAPI BOOL LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetSheetType(LCMSHANDLE hIT8, const char* Type); - --LCMSAPI BOOL LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetComment(LCMSHANDLE hIT8, const char* cComment); - --LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str); --LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val); --LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val); --LCMSAPI BOOL LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyStr(LCMSHANDLE hIT8, const char* cProp, const char *Str); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyHex(LCMSHANDLE hIT8, const char* cProp, int Val); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char* cSubProp, const char *Val); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetPropertyUncooked(LCMSHANDLE hIT8, const char* Key, const char* Buffer); - - LCMSAPI const char* LCMSEXPORT cmsIT8GetProperty(LCMSHANDLE hIT8, const char* cProp); - LCMSAPI double LCMSEXPORT cmsIT8GetPropertyDbl(LCMSHANDLE hIT8, const char* cProp); --LCMSAPI int LCMSEXPORT cmsIT8EnumProperties(LCMSHANDLE IT8, char ***PropertyNames); -+LCMSAPI const char* LCMSEXPORT cmsIT8GetPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char *cSubProp); -+LCMSAPI int LCMSEXPORT cmsIT8EnumProperties(LCMSHANDLE IT8, const char ***PropertyNames); -+LCMSAPI int LCMSEXPORT cmsIT8EnumPropertyMulti(LCMSHANDLE hIT8, const char* cProp, const char*** SubpropertyNames); - - // Datasets - -@@ -89,10 +92,10 @@ - LCMSAPI const char* LCMSEXPORT cmsIT8GetDataRowCol(LCMSHANDLE IT8, int row, int col); - LCMSAPI double LCMSEXPORT cmsIT8GetDataRowColDbl(LCMSHANDLE IT8, int col, int row); - --LCMSAPI BOOL LCMSEXPORT cmsIT8SetDataRowCol(LCMSHANDLE hIT8, int row, int col, -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetDataRowCol(LCMSHANDLE hIT8, int row, int col, - const char* Val); - --LCMSAPI BOOL LCMSEXPORT cmsIT8SetDataRowColDbl(LCMSHANDLE hIT8, int row, int col, -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetDataRowColDbl(LCMSHANDLE hIT8, int row, int col, - double Val); - - LCMSAPI const char* LCMSEXPORT cmsIT8GetData(LCMSHANDLE IT8, const char* cPatch, const char* cSample); -@@ -100,15 +103,15 @@ - - LCMSAPI double LCMSEXPORT cmsIT8GetDataDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample); - --LCMSAPI BOOL LCMSEXPORT cmsIT8SetData(LCMSHANDLE IT8, const char* cPatch, -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetData(LCMSHANDLE IT8, const char* cPatch, - const char* cSample, - const char *Val); - --LCMSAPI BOOL LCMSEXPORT cmsIT8SetDataDbl(LCMSHANDLE hIT8, const char* cPatch, -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetDataDbl(LCMSHANDLE hIT8, const char* cPatch, - const char* cSample, - double Val); - --LCMSAPI BOOL LCMSEXPORT cmsIT8SetDataFormat(LCMSHANDLE IT8, int n, const char *Sample); -+LCMSAPI LCMSBOOL LCMSEXPORT cmsIT8SetDataFormat(LCMSHANDLE IT8, int n, const char *Sample); - LCMSAPI int LCMSEXPORT cmsIT8EnumDataFormat(LCMSHANDLE IT8, char ***SampleNames); - - LCMSAPI void LCMSEXPORT cmsIT8DefineDblFormat(LCMSHANDLE IT8, const char* Formatter); -@@ -126,7 +129,7 @@ - // #define STRICT_CGATS 1 - - #define MAXID 128 // Max lenght of identifier --#define MAXSTR 255 // Max lenght of string -+#define MAXSTR 1024 // Max lenght of string - #define MAXTABLES 255 // Max Number of tables in a single stream - #define MAXINCLUDE 20 // Max number of nested includes - -@@ -137,6 +140,9 @@ - - #ifndef NON_WINDOWS - #include -+#define DIR_CHAR '\\' -+#else -+#define DIR_CHAR '/' - #endif - - // Symbols -@@ -160,6 +166,7 @@ - SEND_DATA, - SEND_DATA_FORMAT, - SKEYWORD, -+ SDATA_FORMAT_ID, - SINCLUDE - - } SYMBOL; -@@ -171,7 +178,8 @@ - WRITE_UNCOOKED, - WRITE_STRINGIFY, - WRITE_HEXADECIMAL, -- WRITE_BINARY -+ WRITE_BINARY, -+ WRITE_PAIR - - } WRITEMODE; - -@@ -181,6 +189,8 @@ - - struct _KeyVal* Next; - char* Keyword; // Name of variable -+ struct _KeyVal* NextSubkey; // If key is a dictionary, points to the next item -+ char* Subkey; // If key is a dictionary, points to the subkey name - char* Value; // Points to value - WRITEMODE WriteAs; // How to write the value - -@@ -220,7 +230,12 @@ - - } TABLE, *LPTABLE; - -+// File stream being parsed - -+typedef struct _FileContext { -+ char FileName[MAX_PATH]; // File name if being readed from file -+ FILE* Stream; // File stream or NULL if holded in memory -+ } FILECTX, *LPFILECTX; - - // This struct hold all information about an openened - // IT8 handler. Only one dataset is allowed. -@@ -257,9 +272,9 @@ - char* Source; // Points to loc. being parsed - int lineno; // line counter for error reporting - -- char FileName[MAX_PATH]; // File name if being readed from file -- FILE* Stream[MAXINCLUDE]; // File stream or NULL if holded in memory -+ LPFILECTX FileStack[MAXINCLUDE]; // Stack of files being parsed - int IncludeSP; // Include Stack Pointer -+ - char* MemoryBlock; // The stream if holded in memory - - char DoubleFormatter[MAXID]; // Printf-like 'double' formatter -@@ -298,6 +313,7 @@ - {".INCLUDE", SINCLUDE}, - {"BEGIN_DATA", SBEGIN_DATA }, - {"BEGIN_DATA_FORMAT", SBEGIN_DATA_FORMAT }, -+ {"DATA_FORMAT_IDENTIFIER", SDATA_FORMAT_ID}, - {"END_DATA", SEND_DATA}, - {"END_DATA_FORMAT", SEND_DATA_FORMAT}, - {"KEYWORD", SKEYWORD} -@@ -308,49 +324,94 @@ - - // Predefined properties - --static const char* PredefinedProperties[] = { -+// A property -+typedef struct { -+ const char *id; -+ WRITEMODE as; -+ } PROPERTY; - -- "NUMBER_OF_FIELDS", // Required - NUMBER OF FIELDS -- "NUMBER_OF_SETS", // Required - NUMBER OF SETS -- "ORIGINATOR", // Required - Identifies the specific system, organization or individual that created the data file. -- "FILE_DESCRIPTOR", // Required - Describes the purpose or contents of the data file. -- "CREATED", // Required - Indicates date of creation of the data file. -- "DESCRIPTOR", // Required - Describes the purpose or contents of the data file. -- "DIFFUSE_GEOMETRY", // The diffuse geometry used. Allowed values are "sphere" or "opal". -- "MANUFACTURER", -- "MANUFACTURE", // Some broken Fuji targets does store this value -- "PROD_DATE", // Identifies year and month of production of the target in the form yyyy:mm. -- "SERIAL", // Uniquely identifies individual physical target. -+static PROPERTY PredefinedProperties[] = { - -- "MATERIAL", // Identifies the material on which the target was produced using a code -+ {"NUMBER_OF_FIELDS", WRITE_UNCOOKED}, // Required - NUMBER OF FIELDS -+ {"NUMBER_OF_SETS", WRITE_UNCOOKED}, // Required - NUMBER OF SETS -+ {"ORIGINATOR", WRITE_STRINGIFY}, // Required - Identifies the specific system, organization or individual that created the data file. -+ {"FILE_DESCRIPTOR", WRITE_STRINGIFY}, // Required - Describes the purpose or contents of the data file. -+ {"CREATED", WRITE_STRINGIFY}, // Required - Indicates date of creation of the data file. -+ {"DESCRIPTOR", WRITE_STRINGIFY}, // Required - Describes the purpose or contents of the data file. -+ {"DIFFUSE_GEOMETRY", WRITE_STRINGIFY}, // The diffuse geometry used. Allowed values are "sphere" or "opal". -+ {"MANUFACTURER", WRITE_STRINGIFY}, -+ {"MANUFACTURE", WRITE_STRINGIFY}, // Some broken Fuji targets does store this value -+ {"PROD_DATE", WRITE_STRINGIFY}, // Identifies year and month of production of the target in the form yyyy:mm. -+ {"SERIAL", WRITE_STRINGIFY}, // Uniquely identifies individual physical target. -+ -+ {"MATERIAL", WRITE_STRINGIFY}, // Identifies the material on which the target was produced using a code - // uniquely identifying th e material. This is intend ed to be used for IT8.7 - // physical targets only (i.e . IT8.7/1 a nd IT8.7/2). - -- "INSTRUMENTATION", // Used to report the specific instrumentation used (manufacturer and -+ {"INSTRUMENTATION", WRITE_STRINGIFY}, // Used to report the specific instrumentation used (manufacturer and - // model number) to generate the data reported. This data will often - // provide more information about the particular data collected than an - // extensive list of specific details. This is particularly important for - // spectral data or data derived from spectrophotometry. - -- "MEASUREMENT_SOURCE", // Illumination used for spectral measurements. This data helps provide -+ {"MEASUREMENT_SOURCE", WRITE_STRINGIFY}, // Illumination used for spectral measurements. This data helps provide - // a guide to the potential for issues of paper fluorescence, etc. - -- "PRINT_CONDITIONS", // Used to define the characteristics of the printed sheet being reported. -+ {"PRINT_CONDITIONS", WRITE_STRINGIFY}, // Used to define the characteristics of the printed sheet being reported. - // Where standard conditions have been defined (e.g., SWOP at nominal) - // named conditions may suffice. Otherwise, detailed information is - // needed. - -- "SAMPLE_BACKING", // Identifies the backing material used behind the sample during -- // measurement. Allowed values are ?black?, ?white?, or "na". -+ {"SAMPLE_BACKING", WRITE_STRINGIFY}, // Identifies the backing material used behind the sample during -+ // measurement. Allowed values are ?black?, ?white?, or {"na". -+ -+ {"CHISQ_DOF", WRITE_STRINGIFY}, // Degrees of freedom associated with the Chi squared statistic -+ -+// new in recent specs: -+ {"MEASUREMENT_GEOMETRY", WRITE_STRINGIFY}, // The type of measurement, either reflection or transmission, should be indicated -+ // along with details of the geometry and the aperture size and shape. For example, -+ // for transmission measurements it is important to identify 0/diffuse, diffuse/0, -+ // opal or integrating sphere, etc. For reflection it is important to identify 0/45, -+ // 45/0, sphere (specular included or excluded), etc. -+ -+ {"FILTER", WRITE_STRINGIFY}, // Identifies the use of physical filter(s) during measurement. Typically used to -+ // denote the use of filters such as none, D65, Red, Green or Blue. -+ -+ {"POLARIZATION", WRITE_STRINGIFY}, // Identifies the use of a physical polarization filter during measurement. Allowed -+ // values are {"yes?, ?white?, ?none? or ?na?. -+ -+ {"WEIGHTING_FUNCTION", WRITE_PAIR}, // Indicates such functions as: the CIE standard observer functions used in the -+ // calculation of various data parameters (2 degree and 10 degree), CIE standard -+ // illuminant functions used in the calculation of various data parameters (e.g., D50, -+ // D65, etc.), density status response, etc. If used there shall be at least one -+ // name-value pair following the WEIGHTING_FUNCTION tag/keyword. The first attribute -+ // in the set shall be {"name" and shall identify the particular parameter used. -+ // The second shall be {"value" and shall provide the value associated with that name. -+ // For ASCII data, a string containing the Name and Value attribute pairs shall follow -+ // the weighting function keyword. A semi-colon separates attribute pairs from each -+ // other and within the attribute the name and value are separated by a comma. -+ -+ {"COMPUTATIONAL_PARAMETER", WRITE_PAIR}, // Parameter that is used in computing a value from measured data. Name is the name -+ // of the calculation, parameter is the name of the parameter used in the calculation -+ // and value is the value of the parameter. -+ -+ {"TARGET_TYPE", WRITE_STRINGIFY}, // The type of target being measured, e.g. IT8.7/1, IT8.7/3, user defined, etc. -+ -+ {"COLORANT", WRITE_STRINGIFY}, // Identifies the colorant(s) used in creating the target. - -- "CHISQ_DOF" // Degrees of freedom associated with the Chi squared statistic -+ {"TABLE_DESCRIPTOR", WRITE_STRINGIFY}, // Describes the purpose or contents of a data table. -+ -+ {"TABLE_NAME", WRITE_STRINGIFY} // Provides a short name for a data table. - }; - --#define NUMPREDEFINEDPROPS (sizeof(PredefinedProperties)/sizeof(char *)) -+#define NUMPREDEFINEDPROPS (sizeof(PredefinedProperties)/sizeof(PROPERTY)) - - - // Predefined sample types on dataset - static const char* PredefinedSampleID[] = { -+ "SAMPLE_ID", // Identifies sample that data represents -+ "STRING", // Identifies label, or other non-machine readable value. -+ // Value must begin and end with a " symbol - - "CMYK_C", // Cyan component of CMYK data expressed as a percentage - "CMYK_M", // Magenta component of CMYK data expressed as a percentage -@@ -378,7 +439,7 @@ - "LAB_B", // b* component of Lab data - "LAB_C", // C*ab component of Lab data - "LAB_H", // hab component of Lab data -- "LAB_DE" // CIE dE -+ "LAB_DE", // CIE dE - "LAB_DE_94", // CIE dE using CIE 94 - "LAB_DE_CMC", // dE using CMC - "LAB_DE_2000", // CIE dE using CIE DE 2000 -@@ -388,7 +449,7 @@ - "STDEV_Y", // Standard deviation of Y (tristimulus data) - "STDEV_Z", // Standard deviation of Z (tristimulus data) - "STDEV_L", // Standard deviation of L* -- "STDEV_A" // Standard deviation of a* -+ "STDEV_A", // Standard deviation of a* - "STDEV_B", // Standard deviation of b* - "STDEV_DE", // Standard deviation of CIE dE - "CHI_SQD_PAR"}; // The average of the standard deviations of L*, a* and b*. It is -@@ -397,57 +458,119 @@ - - #define NUMPREDEFINEDSAMPLEID (sizeof(PredefinedSampleID)/sizeof(char *)) - -+//Forward declaration of some internal functions -+static -+void* AllocChunk(LPIT8 it8, size_t size); -+ - // Checks if c is a separator - static --BOOL isseparator(int c) -+LCMSBOOL isseparator(int c) - { - return (c == ' ') || (c == '\t') || (c == '\r'); - } - - // Checks whatever if c is a valid identifier char -- - static --BOOL ismiddle(int c) -+LCMSBOOL ismiddle(int c) - { - return (!isseparator(c) && (c != '#') && (c !='\"') && (c != '\'') && (c > 32) && (c < 127)); - } - - // Checks whatsever if c is a valid identifier middle char. - static --BOOL isidchar(int c) -+LCMSBOOL isidchar(int c) - { - return isalnum(c) || ismiddle(c); From langel at redhat.com Fri May 1 09:41:20 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 01 May 2009 12:41:20 -0400 Subject: [FYI]: Updated to the new b16 bundle Message-ID: <49FB2630.3040207@redhat.com> Hi, I updated the repo to use the new b16 bundle which was posted today. 2009-05-01 Lillian Angel * HACKING: Updated. * Makefile.am: Updated to new b16 bundle. (ICEDTEA_PATCHES): Removed patches/icedtea-enum-bug-181.patch. * patches/icedtea-lcms.patch: Updated. Only includes a single patch for cmsxform.c. * patches/icedtea-enum-bug-181.patch: Removed. From bugzilla-daemon at icedtea.classpath.org Fri May 1 10:22:34 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 01 May 2009 17:22:34 +0000 Subject: [Bug 331] New: IcedTeaPlugin.cc doesn't compile against xulrunner 1.9.1 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=331 Summary: IcedTeaPlugin.cc doesn't compile against xulrunner 1.9.1 Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mark at klomp.org CC: dbhole at redhat.com IcedTeaPlugin.cc: In member function ?nsresult IcedTeaPluginFactory::StartAppletviewer()?: IcedTeaPlugin.cc:3941: error: no matching function for call to ?nsIProcess::Run(int, const char**&, int&, int)? /usr/include/xulrunner-sdk-1.9.1/unstable/nsIProcess.h:66: note: candidates are: virtual nsresult nsIProcess::Run(PRBool, const char**, PRUint32) make: *** [IcedTeaPlugin.o] Error 1 According to https://developer.mozilla.org/en/nsIProcess#run.28.29: "Prior to Gecko 1.9.1 (Firefox 3.5), this method returned the process ID of the newly executing process. It no longer returns a value." -- 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 doko at ubuntu.com Fri May 1 10:51:37 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Fri, 01 May 2009 17:51:37 +0000 Subject: changeset in /hg/icedtea6: 2009-05-01 Matthias Klose changeset d0f6e94ed76d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d0f6e94ed76d description: 2009-05-01 Matthias Klose * patches/icedtea-cacao.patch: Create new thread depending on the current VM. * Makefile.am (ICEDTEA_PATCHES): Apply unconditionally. (icedtea-against-icedtea): Add dependencies on stamps/add-cacao.stamp, stamps/add-zero.stamp. (icedtea-debug-against-icedtea): Add dependencies on stamps/add-cacao-debug.stamp, stamps/add-zero-debug.stamp. (stamps/add-{cacao,zero}{,-debug}.stamp: New. (clean, stamps/download.stamp, clean-download, stamps/extract.stamp stamps/cacao.stamp): Use BUILD_CACAO instead of WITH_CACAO. (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): Add VM aliases for cacao and zero when configured as ZERO_BUILD or WITH_CACAO. * configure.ac: New option --with-additional-vms=, new conditionals ADD_CACAO_BUILD, ADD_ZERO_BUILD, ADD_SHARK_BUILD, BUILD_CACAO. diffstat: 8 files changed, 266 insertions(+), 18 deletions(-) ChangeLog | 17 ++++ HACKING | 3 INSTALL | 17 ++++ Makefile.am | 148 ++++++++++++++++++++++++++++++++++++++++--- NEWS | 4 + README | 18 +++++ configure.ac | 40 +++++++++++ patches/icedtea-cacao.patch | 37 +++++++++- diffs (454 lines): diff -r 868030b86280 -r d0f6e94ed76d ChangeLog --- a/ChangeLog Fri May 01 12:26:02 2009 -0400 +++ b/ChangeLog Fri May 01 19:47:19 2009 +0200 @@ -1,3 +1,20 @@ 2009-05-01 Lillian Angel + + * patches/icedtea-cacao.patch: Create new thread depending on the + current VM. + * Makefile.am (ICEDTEA_PATCHES): Apply unconditionally. + (icedtea-against-icedtea): Add dependencies on stamps/add-cacao.stamp, + stamps/add-zero.stamp. + (icedtea-debug-against-icedtea): Add dependencies on + stamps/add-cacao-debug.stamp, stamps/add-zero-debug.stamp. + (stamps/add-{cacao,zero}{,-debug}.stamp: New. + (clean, stamps/download.stamp, clean-download, stamps/extract.stamp + stamps/cacao.stamp): Use BUILD_CACAO instead of WITH_CACAO. + (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): Add VM aliases + for cacao and zero when configured as ZERO_BUILD or WITH_CACAO. + * configure.ac: New option --with-additional-vms=, new conditionals + ADD_CACAO_BUILD, ADD_ZERO_BUILD, ADD_SHARK_BUILD, BUILD_CACAO. + 2009-05-01 Lillian Angel * HACKING: Updated. diff -r 868030b86280 -r d0f6e94ed76d HACKING --- a/HACKING Fri May 01 12:26:02 2009 -0400 +++ b/HACKING Fri May 01 19:47:19 2009 +0200 @@ -94,6 +94,7 @@ The following patches are currently appl * icedtea-java2d-mitre-join.patch: Backport fix for mitre join decoration (S6812600). * icedtea-java2d-stroker-internal-joint.patch: Fix penultimate joint created by GeneralPath.closePath(). * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath(). +* icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM. The following patches are only applied to OpenJDK6 in IcedTea6: @@ -152,8 +153,6 @@ The following patches are only applied w The following patches are only applied when building with the CACAO virtual machine: -* icedtea-cacao.patch: Don't run 'java' in a new thread. - The following patches are to support Xrender pipeline (-Dsun.java2d.xrender): * icedtea-xrender-xxx.patch: Numbered patches from xrender branch diff -r 868030b86280 -r d0f6e94ed76d INSTALL --- a/INSTALL Fri May 01 12:26:02 2009 -0400 +++ b/INSTALL Fri May 01 19:47:19 2009 +0200 @@ -111,3 +111,20 @@ 0.99.3 during the build. To use a diffe --with-cacao-home= to point to an existing installation which use the Sun VM interface. +Building additional virtual machines +------------------------------------ + +Although IcedTea can be built multiple times to use a different virtual +machine, addtional VM's can be built without building the other components +multiple times. + +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 +default VM, and zero as additional VM. + +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-'. diff -r 868030b86280 -r d0f6e94ed76d Makefile.am --- a/Makefile.am Fri May 01 12:26:02 2009 -0400 +++ b/Makefile.am Fri May 01 19:47:19 2009 +0200 @@ -72,8 +72,13 @@ if ENABLE_GCJWEBPLUGIN rm -f gcjwebplugin.so endif endif +if BUILD_CACAO rm -rf cacao +endif rm -f jni-common.o +if ADD_ZERO_BUILD + rm -rf zerovm +endif install: @@ -377,7 +382,7 @@ endif endif endif endif -if WITH_CACAO +if BUILD_CACAO if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP else @@ -425,7 +430,7 @@ clean-download: clean-download: rm -f stamps/download.stamp rm -f $(OPENJDK_SRC_ZIP) -if WITH_CACAO +if BUILD_CACAO rm -f $(CACAO_SRC_ZIP) endif if WITH_VISUALVM @@ -632,9 +637,10 @@ ICEDTEA_PATCHES += \ patches/icedtea-rhino.patch endif +ICEDTEA_PATCHES += \ + patches/icedtea-cacao.patch if WITH_CACAO ICEDTEA_PATCHES += \ - patches/icedtea-cacao.patch \ patches/icedtea-cacao-ignore-jdi-tests.patch \ patches/icedtea-cacao-ignore-tests.patch endif @@ -707,7 +713,7 @@ if WITH_ALT_HSBUILD fi endif endif -if WITH_CACAO +if BUILD_CACAO if !USE_SYSTEM_CACAO if ! test -d cacao ; \ then \ @@ -1173,6 +1179,12 @@ endif cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib +if ZERO_BUILD + printf -- '-zero 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 @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) mkdir -p stamps touch stamps/icedtea.stamp @@ -1245,6 +1257,12 @@ endif cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \ extra-lib/about.jar \ $(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 WITH_CACAO + printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif @echo "IcedTea (debug build) is served:" \ $(BUILD_OUTPUT_DIR)-debug mkdir -p stamps @@ -1258,11 +1276,15 @@ clean-icedtea: stamps/extract.stamp icedtea-against-icedtea: \ stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea.stamp + stamps/icedtea.stamp \ + stamps/add-cacao.stamp \ + stamps/add-zero.stamp icedtea-debug-against-icedtea: \ stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea-debug.stamp + stamps/icedtea-debug.stamp \ + stamps/add-cacao-debug.stamp \ + stamps/add-zero-debug.stamp # OpenJDK ecj Targets # =================== @@ -1559,10 +1581,10 @@ extra-lib/about.jar: stamps/extra-class- fi stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp -if WITH_CACAO +if BUILD_CACAO if !USE_SYSTEM_CACAO cd cacao/cacao && \ - ./configure \ + $(ARCH_PREFIX) ./configure \ --host=$(host_alias) \ --build=$(build_alias) \ --target=$(target_alias) \ @@ -1571,7 +1593,7 @@ if !USE_SYSTEM_CACAO --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \ --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \ - make install + $(ARCH_PREFIX) $(MAKE) install endif endif mkdir -p stamps @@ -1717,6 +1739,114 @@ endif endif # end of pulse-java + +# targets for additional VMs + +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) + +stamps/add-cacao.stamp: stamps/icedtea.stamp stamps/cacao.stamp +if ADD_CACAO_BUILD + mkdir -p $(BUILD_JRE_ARCH_DIR)/cacao + install -m 644 cacao/install/lib/libjvm.so \ + $(BUILD_JRE_ARCH_DIR)/cacao/ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ + $(BUILD_JRE_ARCH_DIR)/cacao/ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ + $(BUILD_JRE_ARCH_DIR)/cacao/ + printf -- '-cacao KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +else + printf -- '-cacao ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + +stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp +if ADD_CACAO_BUILD + mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao + install -m 644 cacao/install/lib/libjvm.so \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ + printf -- '-cacao KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +else + printf -- '-cacao ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + + +# configure script arguments, quoted in single quotes +CONFIGURE_ARGS = @CONFIGURE_ARGS@ +ADD_ZERO_CONFIGURE_ARGS = \ + --with-openjdk \ + --with-openjdk-home=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + --enable-zero +if ADD_SHARK_BUILD +ADD_ZERO_CONFIGURE_ARGS += \ + --enable-shark +endif +ADD_ZERO_CONFIGURE_ARGS += \ + --disable-docs \ + $(filter-out '--with-gcj-home=% '--with-ecj=% \ + '--with-java=% '--with-javah=% \ + '--with-rmic=% '--with-additional-vms=% \ + '--with-icedtea '--with-icedtea-home=% \ + '--with-openjdk '--with-openjdk-home=% , \ + $(CONFIGURE_ARGS)) + +ADD_ZERO_EXTRA_BUILD_ENV = \ + BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \ + BUILD_JAXP=false ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \ + BUILD_JAXWS=false ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \ + BUILD_CORBA=false ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \ + BUILD_JDK=false + +stamps/add-zero.stamp: stamps/icedtea.stamp +if ADD_ZERO_BUILD + mkdir -p zerovm + + for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ + cd zerovm && \ + $(ADD_ZERO_EXTRA_BUILD_ENV) \ + $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) + + for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ + $(ADD_ZERO_EXTRA_BUILD_ENV) \ + $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET) + + 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 +else + printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + +stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp +if ADD_ZERO_BUILD + mkdir -p zerovm + + for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ + cd zerovm && \ + $(ADD_ZERO_EXTRA_BUILD_ENV) \ + $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) + + for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ + $(ADD_ZERO_EXTRA_BUILD_ENV) \ + $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET) + + 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 +else + printf -- '-zero ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + +# end additional VMs # jtreg diff -r 868030b86280 -r d0f6e94ed76d NEWS --- a/NEWS Fri May 01 12:26:02 2009 -0400 +++ b/NEWS Fri May 01 19:47:19 2009 +0200 @@ -6,6 +6,10 @@ New in release 1.X (UNRELEASED) tapset that can be used to dynamically trace execution of java applications at runtime. See the tapset/hotspot.stp file for documentation of the various trace points and arguments available. +- Allow building of other virtual machines besides the default VM. Additional + virtual machines on architectures where hotspot is available are cacao + and zero (or shark), and cacao, where zero (or shark) is available. It's + not possible to build cacao as the default VM, and zero as additional VM. New in release 1.4 (2009-01-29) diff -r 868030b86280 -r d0f6e94ed76d README --- a/README Fri May 01 12:26:02 2009 -0400 +++ b/README Fri May 01 19:47:19 2009 +0200 @@ -167,3 +167,21 @@ optionally the systemtap package at run optionally the systemtap package at run time when the user want to use the tapset to trace java programs. The probes have zero overhead when not used and can safely be compiled in even when not used at runtime. + +Support for additional VMs +========================== + +Although IcedTea can be built multiple times to use a different virtual +machine, addtional VM's can be built without building the other components +multiple times. + +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 +default VM, and zero as additional VM. + +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-'. diff -r 868030b86280 -r d0f6e94ed76d configure.ac --- a/configure.ac Fri May 01 12:26:02 2009 -0400 +++ b/configure.ac Fri May 01 19:47:19 2009 +0200 @@ -499,7 +499,39 @@ else fi fi -if test "x${ZERO_BUILD_TRUE}" = x; then +AC_MSG_CHECKING(for --with-additional-vms) +AC_ARG_WITH(additional-vms, + AC_HELP_STRING([--with-additional-vms=vm1,vm2,...], [build additional virtual machines. Valid value is a colon separated string with the backend names `cacao', `zero' and `shark'.]), +[ +if test x$with_additional_vms != x +then + for vm in `echo $with_additional_vms | sed 's/,/ /g'`; do + case "x$vm" in + xcacao) add_vm_cacao=yes;; + xzero) add_vm_zero=yes;; + xshark) add_vm_shark=yes;; + *) AC_MSG_ERROR([proper usage is --with-additional-vms=vm1,vm2,...]) + esac + done +fi]) +AC_MSG_RESULT($with_additional_vms) + +AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x) +AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x) +AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x) +AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes) + +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 + AC_MSG_ERROR([additional vm is the default vm]) +fi +if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then + AC_MSG_ERROR([cannot build with system cacao as additional vm]) +fi + +if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then dnl Check for libffi headers and libraries. PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no]) if test "x${LIBFFI_FOUND}" = xno @@ -517,7 +549,7 @@ AC_SUBST(LIBFFI_CFLAGS) AC_SUBST(LIBFFI_CFLAGS) AC_SUBST(LIBFFI_LIBS) -if test "x${SHARK_BUILD_TRUE}" = x; then +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_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \ @@ -531,4 +563,8 @@ AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LIBS) +# Arguments passed to configure. +AC_SUBST(CONFIGURE_ARGS) +CONFIGURE_ARGS="$ac_configure_args" + AC_OUTPUT diff -r 868030b86280 -r d0f6e94ed76d patches/icedtea-cacao.patch --- a/patches/icedtea-cacao.patch Fri May 01 12:26:02 2009 -0400 +++ b/patches/icedtea-cacao.patch Fri May 01 19:47:19 2009 +0200 @@ -1,12 +1,39 @@ ---- ../icedtea6/openjdk/jdk/src/share/bin/java.c 2008-02-28 10:42:00.000000000 +0100 -+++ openjdk/jdk/src/share/bin/java.c 2008-03-17 16:23:05.804846720 +0100 -@@ -367,7 +367,8 @@ +--- openjdk/jdk/src/share/bin/java.c.orig 2009-03-02 23:21:31.000000000 +0000 ++++ openjdk/jdk/src/share/bin/java.c 2009-03-02 23:23:53.000000000 +0000 +@@ -199,6 +199,8 @@ + InvocationFunctions ifn; + }; + ++#define JNI_VERSION_CACAO 0xcaca0000 ++ + /* + * Entry point. + */ +@@ -360,6 +389,8 @@ + + { /* Create a new thread to create JVM and invoke main method */ + struct JavaMainArgs args; ++ struct JDK1_1InitArgs cacao_args; ++ int jvm_init_rv; + + args.argc = argc; + args.argv = argv; +@@ -367,7 +398,17 @@ args.classname = classname; args.ifn = ifn; - return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); -+/* return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); */ -+ return JavaMain((void*)&args); ++ memset((void*)&cacao_args, 0, sizeof(cacao_args)); ++ cacao_args.version = JNI_VERSION_CACAO; ++ ++ jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args); ++ if (_launcher_debug) ++ printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no"); ++ ++ if (jvm_init_rv == 0) ++ return JavaMain((void*)&args); ++ else ++ return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); } } From doko at ubuntu.com Fri May 1 11:05:25 2009 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 01 May 2009 20:05:25 +0200 Subject: cacao patch no-mmap-first-page Message-ID: <49FB39E5.8010702@ubuntu.com> Michael, Christian, the attached patch is mentioned in the cacao web pages, but still seems to be required. Would be ok to just check it in IcedTea, or even apply it by default for cacao enabled builds? Matthias -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: cacao-no-mmap-first-page.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090501/f353b7c0/cacao-no-mmap-first-page.diff From langel at redhat.com Fri May 1 11:13:35 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 01 May 2009 18:13:35 +0000 Subject: changeset in /hg/icedtea6: 2009-05-01 Lillian Angel changeset 8a48ae5515d7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8a48ae5515d7 description: 2009-05-01 Lillian Angel * Makefile.am (ICEDTEA_ENV): Set IMPORT_BINARY_PLUGS to true. (ICEDTEA_ENV_ECJ): Likewise. diffstat: 2 files changed, 8 insertions(+) ChangeLog | 6 ++++++ Makefile.am | 2 ++ diffs (32 lines): diff -r d0f6e94ed76d -r 8a48ae5515d7 ChangeLog --- a/ChangeLog Fri May 01 19:47:19 2009 +0200 +++ b/ChangeLog Fri May 01 14:14:15 2009 -0400 @@ -1,3 +1,9 @@ 2009-05-01 Matthias Klose + + * Makefile.am + (ICEDTEA_ENV): Set IMPORT_BINARY_PLUGS to true. + (ICEDTEA_ENV_ECJ): Likewise. + 2009-05-01 Matthias Klose * patches/icedtea-cacao.patch: Create new thread depending on the diff -r d0f6e94ed76d -r 8a48ae5515d7 Makefile.am --- a/Makefile.am Fri May 01 19:47:19 2009 +0200 +++ b/Makefile.am Fri May 01 14:14:15 2009 -0400 @@ -141,6 +141,7 @@ else ICEDTEA_SHARK_BUILD = endif ICEDTEA_ENV = \ + IMPORT_BINARY_PLUGS=true \ ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \ ANT_HOME="$(SYSTEM_ANT_DIR)" \ BUILD_NUMBER="$(OPENJDK_VERSION)" \ @@ -211,6 +212,7 @@ ICEDTEA_CLS_DIR_ECJ = \ ICEDTEA_CLS_DIR_ECJ = \ $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/classes ICEDTEA_ENV_ECJ = \ + IMPORT_BINARY_PLUGS=true \ ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \ ANT_HOME="$(SYSTEM_ANT_DIR)" \ BUILD_NUMBER="$(OPENJDK_VERSION)" \ From langel at redhat.com Fri May 1 11:15:43 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 01 May 2009 14:15:43 -0400 Subject: [FYI]: Set IMPORT_BINARY_PLUGS to true. Message-ID: <49FB3C4F.3020508@redhat.com> Hi, Small change from the old b16 to the new b16 broke the build. IMPORT_BINARY_PLUGS is now set to false by default. I have set it in the IcedTea build to true, since we still need to use our plugs for javaws, plugin etc. 2009-05-01 Lillian Angel * Makefile.am (ICEDTEA_ENV): Set IMPORT_BINARY_PLUGS to true. (ICEDTEA_ENV_ECJ): Likewise. From David.Cox at Sun.COM Fri May 1 11:58:41 2009 From: David.Cox at Sun.COM (David Cox) Date: Fri, 01 May 2009 11:58:41 -0700 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <1241163358.4571.17.camel@hermans.wildebeest.org> References: <20090212150029.GA1121@rivendell.middle-earth.co.uk> <1234731237.3562.6.camel@hermans.wildebeest.org> <17c6771e0902151453t523b15derfc243ffaa201264f@mail.gmail.com> <1234768690.24153.28.camel@localhost.localdomain> <1234772748.3612.3.camel@hermans.wildebeest.org> <1234774554.11228.3.camel@localhost.localdomain> <1234862105.4062.8.camel@fedora.wildebeest.org> <499B727D.6060901@sun.com> <17c6771e0903200428j75e26899x9c15daf57f5ed20e@mail.gmail.com> <49E3ABEA.6020400@sun.com> <1241001697.4267.1.camel@fedora.wildebeest.org> <49F9F971.1010404@sun.com> <1241163358.4571.17.camel@hermans.wildebeest.org> Message-ID: <49FB4661.8070508@sun.com> An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090501/f4e4d3f5/attachment.html From gnu_andrew at member.fsf.org Fri May 1 13:27:12 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 1 May 2009 21:27:12 +0100 Subject: [FYI]: Set IMPORT_BINARY_PLUGS to true. In-Reply-To: <49FB3C4F.3020508@redhat.com> References: <49FB3C4F.3020508@redhat.com> Message-ID: <17c6771e0905011327i8c4f509r3473bc8da97d0e3f@mail.gmail.com> 2009/5/1 Lillian Angel : > Hi, > > Small change from the old b16 to the new b16 broke the build. > IMPORT_BINARY_PLUGS is now set to false by default. I have set it in the > IcedTea build to true, since we still need to use our plugs for javaws, > plugin etc. > > 2009-05-01 ?Lillian Angel ? > > ? ? ? * Makefile.am > ? ? ? (ICEDTEA_ENV): Set IMPORT_BINARY_PLUGS to true. > ? ? ? (ICEDTEA_ENV_ECJ): Likewise. > > While this is ok as a quick fix to regain the original build, we shouldn't be doing this. We need to build the plugin/jaxws outside the plug mechanism. IcedTea7 already does, though I haven't thoroughly tested the resulting plugin, so something may still be broken. -- 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 Fri May 1 13:37:23 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 1 May 2009 21:37:23 +0100 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <1241189725.4454.3.camel@hermans.wildebeest.org> References: <49FAFB05.5030509@redhat.com> <1241189725.4454.3.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905011337w4a6403bfwe21b3ed1d704980@mail.gmail.com> 2009/5/1 Mark Wielaard : > On Fri, 2009-05-01 at 09:37 -0400, Lillian Angel wrote: >> I would like to have a release in the new future, which includes the new >> b16 update and several important improvements to the plugin. >> >> Any objections or suggestions? > > I am working on some small bugs/improvements to the new > --enable-systemtap functionality that Andrew and Matthias pointed out, > which, which I hope to get in by Monday. > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=328 > > --enable-systemtap is disabled by default, so it isn't a blocker, but it > would be nice to have it working an as many setups as possible. > > Thanks, > > Mark > > We should really take the opportunity to clean things up for this release namely: * Remove the defunct gcjwebplugin which doesn't build any more * Remove the SNMP stubs as it is has been possible to build without these for over a year * Likewise, we should be able to build with the b16 default of IMPORT_BINARY_PLUGS=false -- 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 Fri May 1 15:30:22 2009 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Fri, 01 May 2009 15:30:22 -0700 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <17c6771e0905011337w4a6403bfwe21b3ed1d704980@mail.gmail.com> References: <49FAFB05.5030509@redhat.com> <1241189725.4454.3.camel@hermans.wildebeest.org> <17c6771e0905011337w4a6403bfwe21b3ed1d704980@mail.gmail.com> Message-ID: <49FB77FE.3090401@sun.com> Andrew John Hughes wrote: > 2009/5/1 Mark Wielaard : > >> On Fri, 2009-05-01 at 09:37 -0400, Lillian Angel wrote: >> >>> I would like to have a release in the new future, which includes the new >>> b16 update and several important improvements to the plugin. >>> >>> Any objections or suggestions? >>> >> I am working on some small bugs/improvements to the new >> --enable-systemtap functionality that Andrew and Matthias pointed out, >> which, which I hope to get in by Monday. >> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=328 >> >> --enable-systemtap is disabled by default, so it isn't a blocker, but it >> would be nice to have it working an as many setups as possible. >> >> Thanks, >> >> Mark >> >> >> > > We should really take the opportunity to clean things up for this > release namely: > > * Remove the defunct gcjwebplugin which doesn't build any more > * Remove the SNMP stubs as it is has been possible to build without > these for over a year > * Likewise, we should be able to build with the b16 default of > IMPORT_BINARY_PLUGS=false > Yes, the goal remains to remove the plugs from the upstream JDK so it would be preferable if IcedTea did not rely on that mechanism in the build. -Joe From Dalibor.Topic at Sun.COM Fri May 1 17:21:15 2009 From: Dalibor.Topic at Sun.COM (Dalibor Topic) Date: Fri, 01 May 2009 17:21:15 -0700 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <17c6771e0905011337w4a6403bfwe21b3ed1d704980@mail.gmail.com> References: <49FAFB05.5030509@redhat.com> <1241189725.4454.3.camel@hermans.wildebeest.org> <17c6771e0905011337w4a6403bfwe21b3ed1d704980@mail.gmail.com> Message-ID: <49FB91FB.9040504@sun.com> Andrew John Hughes wrote: > * Remove the SNMP stubs as it is has been possible to build without > these for over a year > * Likewise, we should be able to build with the b16 default of > IMPORT_BINARY_PLUGS=false Indeed, that would be cool to have for 1.5. cheers, dalibor topic -- ******************************************************************* Dalibor Topic Tel: (+49 40) 23 646 738 Java F/OSS Ambassador AIM: robiladonaim Sun Microsystems GmbH Mobile: (+49 177) 2664 192 Nagelsweg 55 http://openjdk.java.net D-20097 Hamburg mailto:Dalibor.Topic at sun.com Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten Amtsgericht M?nchen: HRB 161028 Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Dr. Roland B?mer Vorsitzender des Aufsichtsrates: Martin H?ring From codestr0m at osunix.org Sat May 2 12:24:56 2009 From: codestr0m at osunix.org (C.) Date: Sat, 02 May 2009 22:24:56 +0300 Subject: Icedtea6 on OSUNIX (OpenSolaris-like) Message-ID: <49FC9E08.9030103@osunix.org> With a ton of help from the guys in #openjdk I must give a big thanks for an almost fully open bootstrap of Icedtea6. I budged on the C/C++ compiler (cc: Sun Ceres C 5.10 SunOS_i386 2009/03/06) and also introduced libCrun.so.1 dep) Not sure if anyone cares, but the short version is that I've been building a *fully* OpenSolaris technology distro. Parts of core onnv-gate require jdk/javac which I didn't have until yesterday. So now I can remove those patches and in theory build the full onnv-gate. wiki/docs/patches/packages forthcoming.. One question... I don't have the time this week to throughly test the results of a toolchain/compiler change, but interested in any feedback from those who have tested gcc-4.4 (prerelease/RC) and llvm. Specifically, does it build, patches and if anyone has benchmarked to compare the differences. Failing all that I'm interested in a possible laundry list of apps/benchmarks which could serve as a reference point. Really big thanks! ./Christopher --- Community driven OpenSolaris Technology - http://www.osunix.org blog: http://www.codestrom.com From bugzilla-daemon at icedtea.classpath.org Sun May 3 02:11:06 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 03 May 2009 09:11:06 +0000 Subject: [Bug 293] JVM fatal error in VM code (HS 14) after NetworkManager disable / reenable cycle Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=293 caster at gentoo.org changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |caster at gentoo.org ------- Comment #11 from caster at gentoo.org 2009-05-03 09:11 ------- You could workaround the bug by adding this as java parameter: -XX:CompileCommand=exclude,com/aelitis/net/udp/uc/impl/PRUDPPacketHandlerImpl$5,runSupport -- 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 doko at ubuntu.com Sun May 3 07:32:49 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Sun, 03 May 2009 14:32:49 +0000 Subject: changeset in /hg/icedtea6: 2009-05-03 Matthias Klose changeset 2b90f322b87e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2b90f322b87e description: 2009-05-03 Matthias Klose * Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally on BUILD_CACAO. (ADD_ZERO_EXTRA_BUILD_ENV): Filter out cacao patches passed in DISTRIBUTION_PATCHES. (stamps/add-zero.stamp, stamps/add-zero-debug.stamp): Remove obsolete unset commands. diffstat: 2 files changed, 13 insertions(+), 5 deletions(-) ChangeLog | 9 +++++++++ Makefile.am | 9 ++++----- diffs (64 lines): diff -r 8a48ae5515d7 -r 2b90f322b87e ChangeLog --- a/ChangeLog Fri May 01 14:14:15 2009 -0400 +++ b/ChangeLog Sun May 03 16:28:29 2009 +0200 @@ -1,3 +1,12 @@ 2009-05-01 Lillian Angel + + * Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally + on BUILD_CACAO. + (ADD_ZERO_EXTRA_BUILD_ENV): Filter out cacao patches passed in + DISTRIBUTION_PATCHES. + (stamps/add-zero.stamp, stamps/add-zero-debug.stamp): Remove obsolete + unset commands. + 2009-05-01 Lillian Angel * Makefile.am diff -r 8a48ae5515d7 -r 2b90f322b87e Makefile.am --- a/Makefile.am Fri May 01 14:14:15 2009 -0400 +++ b/Makefile.am Sun May 03 16:28:29 2009 +0200 @@ -639,8 +639,10 @@ ICEDTEA_PATCHES += \ patches/icedtea-rhino.patch endif +if BUILD_CACAO ICEDTEA_PATCHES += \ patches/icedtea-cacao.patch +endif if WITH_CACAO ICEDTEA_PATCHES += \ patches/icedtea-cacao-ignore-jdi-tests.patch \ @@ -1802,18 +1804,17 @@ ADD_ZERO_EXTRA_BUILD_ENV = \ BUILD_JAXP=false ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \ BUILD_JAXWS=false ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \ BUILD_CORBA=false ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \ - BUILD_JDK=false + BUILD_JDK=false \ + DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))' stamps/add-zero.stamp: stamps/icedtea.stamp if ADD_ZERO_BUILD mkdir -p zerovm - for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ cd zerovm && \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) - for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET) @@ -1830,12 +1831,10 @@ if ADD_ZERO_BUILD if ADD_ZERO_BUILD mkdir -p zerovm - for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ cd zerovm && \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) - for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET) From mark at klomp.org Sun May 3 13:28:49 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 03 May 2009 22:28:49 +0200 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <17c6771e0905011337w4a6403bfwe21b3ed1d704980@mail.gmail.com> References: <49FAFB05.5030509@redhat.com> <1241189725.4454.3.camel@hermans.wildebeest.org> <17c6771e0905011337w4a6403bfwe21b3ed1d704980@mail.gmail.com> Message-ID: <1241382529.3661.35.camel@hermans.wildebeest.org> Hi Andrew, On Fri, 2009-05-01 at 21:37 +0100, Andrew John Hughes wrote: > We should really take the opportunity to clean things up for this > release namely: Although I am very much in favor of cleanups, right before a release might not be the ideal time to push them through. If we want to do a release this week, we might consider postponing the cleanups to after the release, unless you have cleanup patches already tested. > * Remove the defunct gcjwebplugin which doesn't build any more This seems safe to do. It already defaults to no in configure. Note that there is also a patch necessary so that IcedTeaPlugin can be build against xulrunner 1.9 (firefox 3.0) and xulrunner 1.9.1 (firefox 3.1/3.5). I believe Deepak has one. If not I could write one. It seems important to have this fixed (it should be a simple one-liner check for the applet_viewer_process->Run call in IcedTeapPlugin.cc). > * Remove the SNMP stubs as it is has been possible to build without > these for over a year If you have a simple patch to do this, please post it. > * Likewise, we should be able to build with the b16 default of > IMPORT_BINARY_PLUGS=false That would be nice, but icedtea currently relies on that mechanism to build the "plugs" that we feel are also part of the JSDK (plugin and webstart), even though they aren't in openjdk. This might be less safe to do right before the release. But if you have a patch to make it so, please do propose it. Cheers, Mark From mark at klomp.org Mon May 4 03:42:48 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 04 May 2009 10:42:48 +0000 Subject: changeset in /hg/icedtea6: * Makefile.am (icedtea.stamp): Strip ... Message-ID: changeset 6eac34481362 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6eac34481362 description: * Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp when client not available (ENABLE_SYSTEMTAP only). (icedtea-debug.stamp): Likewise. diffstat: 2 files changed, 30 insertions(+), 10 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 34 ++++++++++++++++++++++++---------- diffs (78 lines): diff -r 2b90f322b87e -r 6eac34481362 ChangeLog --- a/ChangeLog Sun May 03 16:28:29 2009 +0200 +++ b/ChangeLog Mon May 04 12:43:27 2009 +0200 @@ -1,3 +1,9 @@ 2009-05-03 Matthias Klose + + * Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp + when client not available (ENABLE_SYSTEMTAP only). + (icedtea-debug.stamp): Likewise. + 2009-05-03 Matthias Klose * Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally diff -r 2b90f322b87e -r 6eac34481362 Makefile.am --- a/Makefile.am Sun May 03 16:28:29 2009 +0200 +++ b/Makefile.am Mon May 04 12:43:27 2009 +0200 @@ -1172,11 +1172,6 @@ if WITH_VISUALVM cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif -if ENABLE_SYSTEMTAP - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ - cp $(abs_top_builddir)/tapset/*.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset -endif cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ @@ -1188,6 +1183,18 @@ endif endif if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif +if ENABLE_SYSTEMTAP + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ + if test $$? -eq 0; then \ + sed -e '/\/client\/libjvm.so/d' \ + < $(abs_top_builddir)/tapset/hotspot.stp \ + > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + else \ + cp $(abs_top_builddir)/tapset/hotspot.stp \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + fi endif @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) mkdir -p stamps @@ -1250,11 +1257,6 @@ if WITH_VISUALVM cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif -if ENABLE_SYSTEMTAP - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ - cp $(abs_top_srcdir)/tapset/*.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset -endif cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib ; \ @@ -1266,6 +1268,18 @@ endif endif if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif +if ENABLE_SYSTEMTAP + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ + if test $$? -eq 0; then \ + sed -e '/\/client\/libjvm.so/d' \ + < $(abs_top_builddir)/tapset/hotspot.stp \ + > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + else \ + cp $(abs_top_builddir)/tapset/hotspot.stp \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + fi endif @echo "IcedTea (debug build) is served:" \ $(BUILD_OUTPUT_DIR)-debug From mjw at redhat.com Mon May 4 03:48:02 2009 From: mjw at redhat.com (Mark Wielaard) Date: Mon, 04 May 2009 12:48:02 +0200 Subject: Better systemtap java integration - added hotspot tapset In-Reply-To: <17c6771e0904291116g7c3b0b9cy52875cd3df9ba33a@mail.gmail.com> References: <1240933106.2387.43.camel@fedora.wildebeest.org> <1241014389.2402.11.camel@fedora.wildebeest.org> <17c6771e0904291116g7c3b0b9cy52875cd3df9ba33a@mail.gmail.com> Message-ID: <1241434082.2359.11.camel@fedora.wildebeest.org> Hi Andrew, On Wed, 2009-04-29 at 19:16 +0100, Andrew John Hughes wrote: > Builds on x86_64 with a bit of poking and some hacking to remove the > references to the non-existent client VM: > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=328 > > Looks good! Thanks for testing. I resolved the issue above as follows: 2009-05-04 Mark Wielaard * Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp when client not available (ENABLE_SYSTEMTAP only). (icedtea-debug.stamp): Likewise. With this things build and work out of the box also on x86_64 without any manual changes necessary. This is a minimal change so as not to disturb any release testing too much. Systemtap should make optional probes easier to use, so that no such stripping would be necessary in the future: http://sourceware.org/bugzilla/show_bug.cgi?id=10102 Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: tapset-client-remove.patch Type: text/x-patch Size: 2323 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090504/4f467ec2/tapset-client-remove.patch From bugzilla-daemon at icedtea.classpath.org Mon May 4 03:53:56 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 04 May 2009 10:53:56 +0000 Subject: [Bug 328] Systemtap tapset expects both client and server vm libraries to be available Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=328 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #1 from mark at klomp.org 2009-05-04 10:53 ------- Fixed by: changeset: 1497:6eac34481362 tag: tip user: Mark Wielaard date: Mon May 04 12:43:27 2009 +0200 files: ChangeLog Makefile.am description: * Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp when client not available (ENABLE_SYSTEMTAP only). (icedtea-debug.stamp): Likewise. -- 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 xerxes at zafena.se Mon May 4 04:03:45 2009 From: xerxes at zafena.se (=?ISO-8859-15?Q?Xerxes_R=E5nby?=) Date: Mon, 04 May 2009 13:03:45 +0200 Subject: Add option --with-additional-vms, build once, get them all [patch] fix for running autogen.sh with m4 1.4.10 In-Reply-To: <49F9ABB4.8090101@ubuntu.com> References: <49F9ABB4.8090101@ubuntu.com> Message-ID: <49FECB91.2090604@zafena.se> Matthias Klose skrev: > The attached patch adds a configure option --with-additional-vms, which allows > passing of --with-additional-vms=cacao,shark to build two additional vm's on an > architecture where hotspot is the default. Allowed values are cacao, shark and > zero. Shark is not a separate build, but the zero build configured for shark. > > The VM's can then be used with `java -cacao', or `java -zero'. > > - cacao is just built in a separate build directory, without touching the > main build. > > - zero/shark is built by calling the icedtea configure again, and then just > building the hotspot configured for zero. > > The patch doesn't touch the regular build, so it should be safe to apply, but I > would be happy if somebody could test it. > > Matthias > > PS: Requires cacao-0.99.4, will update this in a separate patch. > > m4 on my machine backfired when trying to parse AC_HELP_STRING([--with-additional-vms=vm1,vm2,...] when running autogen.sh. The attached patch fixes this issue on my machine. What are the lowest version of m4/autoconf that icedtea6 should support? log: xerxes at labbserver:~/icedtea6$ ./autogen.sh /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 32 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 43 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 51 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 61 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 67 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 73 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 76 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 78 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 84 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 94 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 101 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 106 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 110 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 118 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 124 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 133 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 140 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 144 > vm2 /usr/bin/m4:configure.ac:504: bad expression in eval (bad input): 153 > vm2 autom4te: /usr/bin/m4 failed with exit status: 1 aclocal: autom4te failed with exit status: 1 autoreconf: aclocal failed with exit status: 1 xerxes at labbserver:~/icedtea6$ m4 --version m4 (GNU M4) 1.4.10 Cheers Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-additional-vms.patch Type: text/x-patch Size: 797 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090504/a9802995/fix-additional-vms.patch From mark at klomp.org Mon May 4 04:16:25 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 04 May 2009 13:16:25 +0200 Subject: Add option --with-additional-vms, build once, get them all [patch] fix for running autogen.sh with m4 1.4.10 In-Reply-To: <49FECB91.2090604@zafena.se> References: <49F9ABB4.8090101@ubuntu.com> <49FECB91.2090604@zafena.se> Message-ID: <1241435785.2359.18.camel@fedora.wildebeest.org> Hi Xerxes, On Mon, 2009-05-04 at 13:03 +0200, Xerxes R?nby wrote: > m4 on my machine backfired when trying to parse > AC_HELP_STRING([--with-additional-vms=vm1,vm2,...] when running autogen.sh. > The attached patch fixes this issue on my machine. > > What are the lowest version of m4/autoconf that icedtea6 should support? What a timely question! I was just testing a patch to make the requirements for the autotools lower to automake 1.9.6 and autoconf 2.59 as on one of my machines. Still testing the patch to make sure it works everywhere. If you could try it out on your setup that would be appreciated. After applying you need to ./autogen.sh && ./configure again of course. Thanks, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: old-autotools.patch Type: text/x-patch Size: 4387 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090504/0093121b/old-autotools.patch From mark at klomp.org Mon May 4 06:36:42 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 04 May 2009 13:36:42 +0000 Subject: changeset in /hg/icedtea6: * Makefile.am (ICEDTEA_PATCHES): Add ... Message-ID: changeset d324d05fc370 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d324d05fc370 description: * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. * patches/icedtea-freetypeversion.patch: New patch. * HACKING: Document new patch. diffstat: 3 files changed, 8 insertions(+) ChangeLog | 6 ++++++ HACKING | 1 + Makefile.am | 1 + diffs (35 lines): diff -r 6eac34481362 -r d324d05fc370 ChangeLog --- a/ChangeLog Mon May 04 12:43:27 2009 +0200 +++ b/ChangeLog Mon May 04 15:37:22 2009 +0200 @@ -1,3 +1,9 @@ 2009-05-04 Mark Wielaard + + * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. + * patches/icedtea-freetypeversion.patch: New patch. + * HACKING: Document new patch. + 2009-05-04 Mark Wielaard * Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp diff -r 6eac34481362 -r d324d05fc370 HACKING --- a/HACKING Mon May 04 12:43:27 2009 +0200 +++ b/HACKING Mon May 04 15:37:22 2009 +0200 @@ -23,6 +23,7 @@ The following patches are currently appl * icedtea-debuginfo.patch: Add -g option to build to generate debugging information. * icedtea-demos.patch: Fix building of JVMTI demo. * icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30) +* icedtea-freetypeversion.patch: freetype backend only requires 2.2.1. * icedtea-fonts.patch: Add Fedora fontconfig. * icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror. * icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name. diff -r 6eac34481362 -r d324d05fc370 Makefile.am --- a/Makefile.am Mon May 04 12:43:27 2009 +0200 +++ b/Makefile.am Mon May 04 15:37:22 2009 +0200 @@ -576,6 +576,7 @@ ICEDTEA_PATCHES += \ patches/icedtea-jpegclasses.patch \ patches/icedtea-uname.patch \ patches/icedtea-ia64-fdlibm.patch \ + patches/icedtea-freetypeversion.patch \ patches/icedtea-fonts.patch \ patches/icedtea-override-redirect-metacity.patch \ patches/icedtea-no-bcopy.patch \ From mjw at redhat.com Mon May 4 06:37:59 2009 From: mjw at redhat.com (Mark Wielaard) Date: Mon, 04 May 2009 15:37:59 +0200 Subject: freetype version check (2.3.0 -> 2.2.1) Message-ID: <1241444279.2359.56.camel@fedora.wildebeest.org> Hi, The REQUIRED_FREETYPE_VERSION in jdk/make/common/shared/Platform.gmk is set to 2.3.0, but the freetype backend doesn't seem to use any new in 2.3.0 api. In fact it builds and runs fine on 2.2.1. Which is the default on centos 5 for example, and they have had packages for a very long time now. The following patch moves the required version down. I have used this in icedtea to build on older installs for a while. 2009-05-04 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. * patches/icedtea-freetypeversion.patch: New patch. * HACKING: Document new patch. Would be nice to have this upstream to facilitate building on a wider range of platforms. Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-freetypeversion.patch Type: text/x-patch Size: 339 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090504/76124371/icedtea-freetypeversion.patch From mark at klomp.org Mon May 4 06:47:06 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 04 May 2009 13:47:06 +0000 Subject: changeset in /hg/icedtea6: * Makefile.am (ICEDTEA_PATCHES): Add ... Message-ID: changeset 395425428c01 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=395425428c01 description: * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. * patches/icedtea-freetypeversion.patch: New patch. * HACKING: Document new patch. diffstat: 1 file changed, 11 insertions(+) patches/icedtea-freetypeversion.patch | 11 +++++++++++ diffs (15 lines): diff -r d324d05fc370 -r 395425428c01 patches/icedtea-freetypeversion.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-freetypeversion.patch Mon May 04 15:47:49 2009 +0200 @@ -0,0 +1,11 @@ +--- openjdk/jdk/make/common/shared/Platform.gmk.orig ++++ openjdk/jdk/make/common/shared/Platform.gmk +@@ -94,7 +94,7 @@ + REQUIRED_BOOT_VER = 1.5 + + # If we are using freetype, this is the required version +-REQUIRED_FREETYPE_VERSION=2.3.0 ++REQUIRED_FREETYPE_VERSION=2.2.1 + + # + # Prune out all known SCM (Source Code Management) directories From mark at klomp.org Mon May 4 06:52:38 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 04 May 2009 13:52:38 +0000 Subject: changeset in /hg/icedtea6: * autogen.sh: Lower requirements to a... Message-ID: changeset 5f50934d11ef in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5f50934d11ef description: * autogen.sh: Lower requirements to autoconf 2.59 and automake 1.9.6. * configure.ac (AM_INIT_AUTOMAKE): Require 1.9 or higher. (abs_top_builddir): Explicitly define. (abs_top_srcdir): Likewise. (additional-vms): Rewrite help string and description. * missing: Remove generated file (autogen.sh). diffstat: 4 files changed, 32 insertions(+), 380 deletions(-) ChangeLog | 9 + autogen.sh | 22 +-- configure.ac | 14 +- missing | 367 ---------------------------------------------------------- diffs (truncated from 502 to 500 lines): diff -r 395425428c01 -r 5f50934d11ef ChangeLog --- a/ChangeLog Mon May 04 15:47:49 2009 +0200 +++ b/ChangeLog Mon May 04 15:53:16 2009 +0200 @@ -1,3 +1,12 @@ 2009-05-04 Mark Wielaard + + * autogen.sh: Lower requirements to autoconf 2.59 and automake 1.9.6. + * configure.ac (AM_INIT_AUTOMAKE): Require 1.9 or higher. + (abs_top_builddir): Explicitly define. + (abs_top_srcdir): Likewise. + (additional-vms): Rewrite help string and description. + * missing: Remove generated file (autogen.sh). + 2009-05-04 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. diff -r 395425428c01 -r 5f50934d11ef autogen.sh --- a/autogen.sh Mon May 04 15:47:49 2009 +0200 +++ b/autogen.sh Mon May 04 15:53:16 2009 +0200 @@ -8,10 +8,10 @@ HAVE_AUTOCONF=false for AUTOCONF in autoconf autoconf259; do if ${AUTOCONF} --version > /dev/null 2>&1; then - AUTOCONF_VERSION=`${AUTOCONF} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + AUTOCONF_VERSION=`${AUTOCONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTOCONF_VERSION} case ${AUTOCONF_VERSION} in - 2.6[1-9]* ) + 2.59* | 2.6[0-9]* ) HAVE_AUTOCONF=true break; ;; @@ -25,7 +25,7 @@ HAVE_AUTOHEADER=false for AUTOHEADER in autoheader autoheader259; do if ${AUTOHEADER} --version > /dev/null 2>&1; then - AUTOHEADER_VERSION=`${AUTOHEADER} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + AUTOHEADER_VERSION=`${AUTOHEADER} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTOHEADER_VERSION} case ${AUTOHEADER_VERSION} in 2.59* | 2.6[0-9]* ) @@ -42,7 +42,7 @@ HAVE_AUTORECONF=false for AUTORECONF in autoreconf; do if ${AUTORECONF} --version > /dev/null 2>&1; then - AUTORECONF_VERSION=`${AUTORECONF} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + AUTORECONF_VERSION=`${AUTORECONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTORECONF_VERSION} case ${AUTORECONF_VERSION} in 2.59* | 2.6[0-9]* ) @@ -55,7 +55,7 @@ done if test ${HAVE_AUTOCONF} = false; then echo "No proper autoconf was found." - echo "You must have autoconf 2.61 or later installed." + echo "You must have autoconf 2.59 or later installed." exit 1 fi @@ -80,10 +80,10 @@ HAVE_ACLOCAL=false for ACLOCAL in aclocal aclocal-1.10; do if ${ACLOCAL} --version > /dev/null 2>&1; then - ACLOCAL_VERSION=`${ACLOCAL} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + ACLOCAL_VERSION=`${ACLOCAL} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${ACLOCAL_VERSION} case ${ACLOCAL_VERSION} in - 1.1[0-9]* ) + 1.9.[6-9] | 1.1[0-9]* ) HAVE_ACLOCAL=true break; ;; @@ -97,10 +97,10 @@ HAVE_AUTOMAKE=false for AUTOMAKE in automake automake-1.10; do if ${AUTOMAKE} --version > /dev/null 2>&1; then - AUTOMAKE_VERSION=`${AUTOMAKE} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + AUTOMAKE_VERSION=`${AUTOMAKE} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTOMAKE_VERSION} case ${AUTOMAKE_VERSION} in - 1.1[0-9]* ) + 1.9.[6-9] | 1.1[0-9]* ) HAVE_AUTOMAKE=true break; ;; @@ -110,13 +110,13 @@ done if test ${HAVE_ACLOCAL} = false; then echo "No proper aclocal was found." - echo "You must have automake 1.10 or later installed." + echo "You must have automake 1.9.6 or later installed." exit 1 fi if test ${HAVE_AUTOMAKE} = false; then echo "No proper automake was found." - echo "You must have automake 1.10 or later installed." + echo "You must have automake 1.9.6 or later installed." exit 1 fi diff -r 395425428c01 -r 5f50934d11ef configure.ac --- a/configure.ac Mon May 04 15:47:49 2009 +0200 +++ b/configure.ac Mon May 04 15:53:16 2009 +0200 @@ -1,6 +1,16 @@ AC_INIT([icedtea6], [1.5pre], [distro-pk AC_INIT([icedtea6], [1.5pre], [distro-pkg-dev at openjdk.java.net]) -AM_INIT_AUTOMAKE([1.10 tar-pax foreign]) +AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) + +# Older automake doesn't generate these correctly +abs_top_builddir=`pwd -P` +AC_SUBST(abs_top_builddir) +abs_top_srcdir=`dirname $0` +cd $abs_top_srcdir +abs_top_srcdir=`pwd` +cd $abs_top_builddir +AC_SUBST(abs_top_srcdir) + AC_CANONICAL_HOST AC_PREFIX_DEFAULT([bootstrap]) @@ -501,7 +511,7 @@ fi AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms, - AC_HELP_STRING([--with-additional-vms=vm1,vm2,...], [build additional virtual machines. Valid value is a colon separated string with the backend names `cacao', `zero' and `shark'.]), + AC_HELP_STRING([--with-additional-vms=vm-list], [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]), [ if test x$with_additional_vms != x then diff -r 395425428c01 -r 5f50934d11ef missing --- a/missing Mon May 04 15:47:49 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,367 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2006-05-10.23 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program 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 for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case $1 in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $1 in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" From mark at klomp.org Mon May 4 06:55:46 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 04 May 2009 15:55:46 +0200 Subject: Add option --with-additional-vms, build once, get them all [patch] fix for running autogen.sh with m4 1.4.10 In-Reply-To: <1241435785.2359.18.camel@fedora.wildebeest.org> References: <49F9ABB4.8090101@ubuntu.com> <49FECB91.2090604@zafena.se> <1241435785.2359.18.camel@fedora.wildebeest.org> Message-ID: <1241445346.2359.59.camel@fedora.wildebeest.org> On Mon, 2009-05-04 at 13:16 +0200, Mark Wielaard wrote: > What a timely question! I was just testing a patch to make the > requirements for the autotools lower to automake 1.9.6 and autoconf 2.59 > as on one of my machines. Still testing the patch to make sure it works > everywhere. If you could try it out on your setup that would be > appreciated. After applying you need to ./autogen.sh && ./configure > again of course. All my tests (on both older and newer autoconf/automake) succeeded. And on irc doko said he thought the change was fine. So committed as: 2009-05-04 Mark Wielaard * autogen.sh: Lower requirements to autoconf 2.59 and automake 1.9.6. * configure.ac (AM_INIT_AUTOMAKE): Require 1.9 or higher. (abs_top_builddir): Explicitly define. (abs_top_srcdir): Likewise. (additional-vms): Rewrite help string and description. * missing: Remove generated file (autogen.sh). Cheers, Mark From doko at ubuntu.com Mon May 4 07:29:28 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Mon, 04 May 2009 14:29:28 +0000 Subject: changeset in /hg/icedtea6: 2009-05-04 Matthias Klose changeset 286d83b611a6 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=286d83b611a6 description: 2009-05-04 Matthias Klose * autogen.sh: Check for autom4te, check variants of versioned commands. diffstat: 2 files changed, 31 insertions(+), 4 deletions(-) ChangeLog | 4 ++++ autogen.sh | 31 +++++++++++++++++++++++++++---- diffs (83 lines): diff -r 5f50934d11ef -r 286d83b611a6 ChangeLog --- a/ChangeLog Mon May 04 15:53:16 2009 +0200 +++ b/ChangeLog Mon May 04 16:25:07 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-04 Mark Wielaard + + * autogen.sh: Check for autom4te, check variants of versioned commands. + 2009-05-04 Mark Wielaard * autogen.sh: Lower requirements to autoconf 2.59 and automake 1.9.6. diff -r 5f50934d11ef -r 286d83b611a6 autogen.sh --- a/autogen.sh Mon May 04 15:53:16 2009 +0200 +++ b/autogen.sh Mon May 04 16:25:07 2009 +0200 @@ -6,7 +6,7 @@ HAVE_AUTOCONF=false -for AUTOCONF in autoconf autoconf259; do +for AUTOCONF in autoconf autoconf259 autoconf2.59; do if ${AUTOCONF} --version > /dev/null 2>&1; then AUTOCONF_VERSION=`${AUTOCONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTOCONF_VERSION} @@ -23,7 +23,7 @@ done HAVE_AUTOHEADER=false -for AUTOHEADER in autoheader autoheader259; do +for AUTOHEADER in autoheader autoheader259 autoheader2.59; do if ${AUTOHEADER} --version > /dev/null 2>&1; then AUTOHEADER_VERSION=`${AUTOHEADER} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTOHEADER_VERSION} @@ -36,11 +36,28 @@ for AUTOHEADER in autoheader autoheader2 fi done +# Test for autom4te. + +HAVE_AUTOM4TE=false + +for AUTOM4TE in autom4te autom4te259 autom4te2.59; do + if ${AUTOM4TE} --version > /dev/null 2>&1; then + AUTOM4TE_VERSION=`${AUTOM4TE} --version | head -1 | sed 's/^[^ ]* [^0-9]*\([0-9.][0-9.]*\).*/\1/'` +# echo ${AUTOM4TE_VERSION} + case ${AUTOM4TE_VERSION} in + 2.59* | 2.6[0-9]* ) + HAVE_AUTOM4TE=true + break; + ;; + esac + fi +done + # Test for autoreconf. HAVE_AUTORECONF=false -for AUTORECONF in autoreconf; do +for AUTORECONF in autoreconf autoreconf2.59; do if ${AUTORECONF} --version > /dev/null 2>&1; then AUTORECONF_VERSION=`${AUTORECONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTORECONF_VERSION} @@ -62,6 +79,12 @@ if test ${HAVE_AUTOHEADER} = false; then if test ${HAVE_AUTOHEADER} = false; then echo "No proper autoheader was found." echo "You must have autoconf 2.59 or later installed." + exit 1 +fi + +if test ${HAVE_AUTOM4TE} = false; then + echo "No proper autom4te was found." + echo "You must have autom4te 2.59 or later installed." exit 1 fi @@ -121,6 +144,6 @@ fi fi -export ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE +export ACLOCAL AUTOCONF AUTOHEADER AUTOM4TE AUTOMAKE ${AUTORECONF} --force --install From bugzilla-daemon at icedtea.classpath.org Mon May 4 09:21:10 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 04 May 2009 16:21:10 +0000 Subject: [Bug 330] Fedora 10 vuze SWT crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=330 ------- Comment #1 from omajid at redhat.com 2009-05-04 16:21 ------- Hi Stuart, Could you please attach the log /home/marinestu22/hs_err_pid10340.log? -- 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 langel at redhat.com Mon May 4 11:22:42 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 04 May 2009 14:22:42 -0400 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <49FAFB05.5030509@redhat.com> References: <49FAFB05.5030509@redhat.com> Message-ID: <49FF3272.1020205@redhat.com> Lillian Angel wrote: > Hi, > > I would like to have a release in the new future, which includes the > new b16 update and several important improvements to the plugin. > > Any objections or suggestions? > > > Cheers, > Lillian There is still quite a bit of work to be done for the upcoming 1.5 release, but I have cloned the main repo: http://icedtea.classpath.org/hg/release/icedtea6-1.5/ It has not been tagged yet, but continue to commit to the main repo and I will update the 1.5 one when we are ready to go. Cheers, Lillian From Phil.Race at Sun.COM Mon May 4 12:34:15 2009 From: Phil.Race at Sun.COM (Phil Race) Date: Mon, 04 May 2009 12:34:15 -0700 Subject: [OpenJDK 2D-Dev] freetype version check (2.3.0 -> 2.2.1) In-Reply-To: <1241444279.2359.56.camel@fedora.wildebeest.org> References: <1241444279.2359.56.camel@fedora.wildebeest.org> Message-ID: <49FF4337.9000502@sun.com> Igor did the freetype work and in he commented in email on 23rd July 2007 : > - Changed required freetype version from 2.3.4 to 2.3.0 > (it did compile with 2.2.1 too for me but Font2DTest was showing garbage > and i had no chance to investigate why this happens) So I don't think we want to move it down without knowing what that was about. It may have been platform-specific. Igor - can you remember two years back ? I also recall there was a nasty bug where having fonts with embedded bitmaps on your system caused an infinite loop inside freetype. I think we needed to update the freetype lib because of that, but I can't remember the details to be sure. Since fonts with embedded bitmaps exist at least on Solaris & Windows such a bug is a a definite problem, -phil. Mark Wielaard wrote: > Hi, > > The REQUIRED_FREETYPE_VERSION in jdk/make/common/shared/Platform.gmk is > set to 2.3.0, but the freetype backend doesn't seem to use any new in > 2.3.0 api. In fact it builds and runs fine on 2.2.1. Which is the > default on centos 5 for example, and they have had packages for a very > long time now. The following patch moves the required version down. I > have used this in icedtea to build on older installs for a while. > > 2009-05-04 Mark Wielaard > > * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. > * patches/icedtea-freetypeversion.patch: New patch. > * HACKING: Document new patch. > > Would be nice to have this upstream to facilitate building on a wider > range of platforms. > > Cheers, > > Mark > From mjw at redhat.com Mon May 4 12:57:23 2009 From: mjw at redhat.com (Mark Wielaard) Date: Mon, 04 May 2009 21:57:23 +0200 Subject: [OpenJDK 2D-Dev] freetype version check (2.3.0 -> 2.2.1) In-Reply-To: <49FF4337.9000502@sun.com> References: <1241444279.2359.56.camel@fedora.wildebeest.org> <49FF4337.9000502@sun.com> Message-ID: <1241467043.26874.12.camel@hermans.wildebeest.org> Hi Phil, On Mon, 2009-05-04 at 12:34 -0700, Phil Race wrote: > Igor did the freetype work and in he commented in email on 23rd July 2007 : > > > - Changed required freetype version from 2.3.4 to 2.3.0 > > (it did compile with 2.2.1 too for me but Font2DTest was showing garbage > > and i had no chance to investigate why this happens) > > So I don't think we want to move it down without knowing what that was about. > It may have been platform-specific. Igor - can you remember two years back ? Interesting, to make sure everything was fine I did also check with that Font2DTest (and some others) and the fact that everything looked just fine was the reason to push it. > I also recall there was a nasty bug where having fonts with embedded > bitmaps on your system caused an infinite loop inside freetype. > I think we needed to update the freetype lib because of that, but > I can't remember the details to be sure. The freetype 2.2.1 package on RHEL and CentOS 5 do have some fixes applied to them. And the java-1.6.0-openjdk package has been deployed on those platforms for some time. So I assume if there were any real bugs they will have been backported at least on those platforms. Ideally of course we would have a autoconf test for the features that the backend relies on. The problem with the hard version check is that it prevents compilation for everybody, even when they really just want to compile against an earlier (patched/fixed) version that might just be what is available for the platform. Let me know if I can help with coming up with a feature test for any issues. Thanks, Mark From bugzilla-daemon at icedtea.classpath.org Mon May 4 15:56:03 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 04 May 2009 22:56:03 +0000 Subject: [Bug 313] "make hotspot" errors Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=313 ------- Comment #1 from omajid at redhat.com 2009-05-04 22:56 ------- Created an attachment (id=208) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=208&action=view) Replace BUILD_ARCH_DIR with INSTALL_ARCH_DIR Unfortunately, there seems to have been some change in the build system in OpenJDK such that the hotspot target doesnt create the j2sdk-image directory and the build now fails with cp openjdk-ecj/build/linux-i586/hotspot/import/jre/lib/i386/server/libjvm.so \ openjdk-ecj/build/linux-i586/j2sdk-image/jre/lib/i386/server cp: cannot create regular file `openjdk-ecj/build/linux-i586/j2sdk-image/jre/lib/i386/server': No such file or directory -- 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 doko at ubuntu.com Mon May 4 17:16:18 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Tue, 05 May 2009 00:16:18 +0000 Subject: changeset in /hg/icedtea6: 2009-05-05 Xerxes Rnby changeset 3ec346e55f66 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ec346e55f66 description: 2009-05-05 Xerxes Rnby * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from SHARK_LLVM_VERSION. diffstat: 2 files changed, 6 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ configure.ac | 2 +- diffs (24 lines): diff -r 286d83b611a6 -r 3ec346e55f66 ChangeLog --- a/ChangeLog Mon May 04 16:25:07 2009 +0200 +++ b/ChangeLog Tue May 05 02:11:58 2009 +0200 @@ -1,3 +1,8 @@ 2009-05-04 Matthias Klose + + * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from + SHARK_LLVM_VERSION. + 2009-05-04 Matthias Klose * autogen.sh: Check for autom4te, check variants of versioned commands. diff -r 286d83b611a6 -r 3ec346e55f66 configure.ac --- a/configure.ac Mon May 04 16:25:07 2009 +0200 +++ b/configure.ac Tue May 05 02:11:58 2009 +0200 @@ -565,7 +565,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te LLVM_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \ sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \ sed -e 's/-D_DEBUG//g'` - LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//'`" + LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`" LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components` LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components` fi From xerxes at zafena.se Tue May 5 03:20:51 2009 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 05 May 2009 12:20:51 +0200 Subject: [patch] shark llvm 2.6 JIT improved optimization level Message-ID: <4A001303.9090800@zafena.se> The LLVM 2.6 JIT api have changed in order to give developers more fine-grained control of the optimization level of the JIT. http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html The attached patch enables Shark to compile against the current llvm 2.6 svn trunk. ... and makes the shark a bit more aggressive. Suggestions are welcome. Cheers Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: shark_llvm2.6_opt.patch Type: text/x-patch Size: 1268 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090505/fbac26a1/shark_llvm2.6_opt.patch From aph at redhat.com Tue May 5 03:24:00 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 05 May 2009 11:24:00 +0100 Subject: [patch] shark llvm 2.6 JIT improved optimization level In-Reply-To: <4A001303.9090800@zafena.se> References: <4A001303.9090800@zafena.se> Message-ID: <4A0013C0.700@redhat.com> Xerxes R?nby wrote: > The LLVM 2.6 JIT api have changed in order to give developers more > fine-grained control of the optimization level of the JIT. > http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html > > The attached patch enables Shark to compile against the current llvm 2.6 > svn trunk. > ... and makes the shark a bit more aggressive. > > Suggestions are welcome. OK, I'll bite. :-) This option should be accessible from the command line. Andrew. From xerxes at zafena.se Tue May 5 04:29:33 2009 From: xerxes at zafena.se (Xerxes R?nby) Date: Tue, 05 May 2009 11:29:33 +0000 Subject: changeset in /hg/icedtea6: 2009-05-05 Xerxes R?nby changeset be7c5293ac85 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be7c5293ac85 description: 2009-05-05 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp (SharkCompiler::SharkCompiler): Use bool or enum to set JIT optimization dependent on the llvm version. diffstat: 2 files changed, 18 insertions(+) ChangeLog | 6 ++++++ ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 12 ++++++++++++ diffs (36 lines): diff -r 3ec346e55f66 -r be7c5293ac85 ChangeLog --- a/ChangeLog Tue May 05 02:11:58 2009 +0200 +++ b/ChangeLog Tue May 05 13:30:07 2009 +0200 @@ -1,3 +1,9 @@ 2009-05-05 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp + (SharkCompiler::SharkCompiler): Use bool or enum to set + JIT optimization dependent on the llvm version. + 2009-05-05 Xerxes R??nby * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from diff -r 3ec346e55f66 -r be7c5293ac85 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue May 05 02:11:58 2009 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue May 05 13:30:07 2009 +0200 @@ -41,7 +41,19 @@ SharkCompiler::SharkCompiler() ModuleProvider *module_provider = new ExistingModuleProvider(module()); _memory_manager = new SharkMemoryManager(); _execution_engine = ExecutionEngine::createJIT( +#if SHARK_LLVM_VERSION >= 26 + /* + * LLVM 26 introduced a more fine-grained control to set the optimization + * level when creating the LLVM JIT. + * The optimization level are now specified with a enum instead of a bool. + * CodeGenOpt::None = bool true; a fast JIT with reduced optimization. + * CodeGenOpt::Default = bool false; a non-fast JIT with optimization. + * CodeGenOpt::Aggressive = a new non-fast JIT with best optimization. + */ + module_provider, NULL, memory_manager(), CodeGenOpt::Default); +#else module_provider, NULL, memory_manager(), false); +#endif // Initialize Shark components that need it SharkType::initialize(); From xerxes at zafena.se Tue May 5 04:42:17 2009 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 05 May 2009 13:42:17 +0200 Subject: [patch] shark llvm 2.6 JIT improved optimization level In-Reply-To: <4A0013C0.700@redhat.com> References: <4A001303.9090800@zafena.se> <4A0013C0.700@redhat.com> Message-ID: <4A002619.6090107@zafena.se> Andrew Haley skrev: > Xerxes R?nby wrote: > >> The LLVM 2.6 JIT api have changed in order to give developers more >> fine-grained control of the optimization level of the JIT. >> http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html >> >> The attached patch enables Shark to compile against the current llvm 2.6 >> svn trunk. >> ... and makes the shark a bit more aggressive. >> >> Suggestions are welcome. >> > > OK, I'll bite. :-) > > This option should be accessible from the command line. > > Andrew. > I have committed the patch with a change to make it use the same optimization level as before since shark currently only have one optimization level. If we want to be able to use the command line to set the optimization level then it could be implemented in a number of ways: We could add a new -XX option like -XX:SharkOptimization=Aggressive We could as well make shark hotspot respond to the "standard" -client and -server options in order to set the optimization suitable for responsive user interaction or bulk server throughput. Cheers Xerxes From aph at redhat.com Tue May 5 04:49:59 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 05 May 2009 12:49:59 +0100 Subject: [patch] shark llvm 2.6 JIT improved optimization level In-Reply-To: <4A002619.6090107@zafena.se> References: <4A001303.9090800@zafena.se> <4A0013C0.700@redhat.com> <4A002619.6090107@zafena.se> Message-ID: <4A0027E7.5020101@redhat.com> Xerxes R?nby wrote: > Andrew Haley skrev: >> Xerxes R?nby wrote: >> >>> The LLVM 2.6 JIT api have changed in order to give developers more >>> fine-grained control of the optimization level of the JIT. >>> http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html >>> >>> The attached patch enables Shark to compile against the current llvm 2.6 >>> svn trunk. >>> ... and makes the shark a bit more aggressive. >>> >>> Suggestions are welcome. >>> >> >> OK, I'll bite. :-) >> >> This option should be accessible from the command line. > I have committed the patch with a change to make it use the same > optimization level as before since shark currently only have one > optimization level. > > If we want to be able to use the command line to set the optimization > level then it could be implemented in a number of ways: > > We could add a new -XX option like -XX:SharkOptimization=Aggressive > > We could as well make shark hotspot respond to the "standard" -client > and -server options in order to set the optimization suitable for > responsive user interaction or bulk server throughput. I don't think that -client and -server really give us what we need. In order to find out what optimization levels we should use we need to be able to benchmark with varying levels. If there is a Java parameter that corresponds with the LLVM levels, than we can use that, but I don't think there is. It might be, for example, that Aggressive optimization is pointless. I don't know. Andrew. From gbenson at redhat.com Tue May 5 05:29:19 2009 From: gbenson at redhat.com (Gary Benson) Date: Tue, 5 May 2009 13:29:19 +0100 Subject: [patch] shark llvm 2.6 JIT improved optimization level In-Reply-To: <4A0027E7.5020101@redhat.com> References: <4A001303.9090800@zafena.se> <4A0013C0.700@redhat.com> <4A002619.6090107@zafena.se> <4A0027E7.5020101@redhat.com> Message-ID: <20090505122919.GA3488@redhat.com> Andrew Haley wrote: > Xerxes R?nby wrote: > > Andrew Haley skrev: > > > Xerxes R?nby wrote: > > > > The LLVM 2.6 JIT api have changed in order to give developers > > > > more fine-grained control of the optimization level of the JIT. > > > > http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html > > > > > > OK, I'll bite. :-) > > > > > > This option should be accessible from the command line. > > > > I have committed the patch with a change to make it use the same > > optimization level as before since shark currently only have one > > optimization level. > > > > If we want to be able to use the command line to set the > > optimization level then it could be implemented in a number > > of ways: > > > > We could add a new -XX option like -XX:SharkOptimization=Aggressive > > > > We could as well make shark hotspot respond to the "standard" > > -client and -server options in order to set the optimization > > suitable for responsive user interaction or bulk server > > throughput. > > I don't think that -client and -server really give us what we need. > In order to find out what optimization levels we should use we need > to be able to benchmark with varying levels. If there is a Java > parameter that corresponds with the LLVM levels, than we can use > that, but I don't think there is. > > It might be, for example, that Aggressive optimization is pointless. > I don't know. My preference would be for -XX:SharkOptimization=Aggressive. The problem with -client and -server is that they already have a meaning, and they're handled in a completely different way to all other command line options, so getting them through to Shark would involve some pretty invasive modifications. Cheers, Gary -- http://gbenson.net/ From gbenson at redhat.com Tue May 5 06:23:25 2009 From: gbenson at redhat.com (Gary Benson) Date: Tue, 5 May 2009 14:23:25 +0100 Subject: Zero and Shark patch refactoring Message-ID: <20090505132324.GB3488@redhat.com> Hi all, As a prelude to upstreaming Zero and Shark I want to alter the makefiles to apply Zero and Shark patches for all builds. This shouldn't cause any problems (everything is conditional) and since this is how they'll be when they're upstream it'd be good to get some initial testing. Does anybody have any problems with this? Also, to make this easier I'd like to get rid of the stuff for building Zero using the bundled HotSpot. Is anybody still using Zero like that? Cheers, Gary -- http://gbenson.net/ From dbhole at redhat.com Tue May 5 07:29:47 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 5 May 2009 10:29:47 -0400 Subject: Patch for Bug #331 (compiling with xulrunner 1.9.1) Message-ID: <20090505142947.GA3517@redhat.com> Attached patch adds conditional compilation for the plugin, so that it can compile with xulrunner 1.9.1 and older versions. I have tested the patch on an F10 box (xul 1.9.10) and rawhide (xul 1.9.1). Bug is here: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=331 ChangeLog: 2009-05-05 Deepak Bhole * IcedTeaPlugin.cc: Add conditional compilation block. * Makefile.am: Define a collapsed (comparable) version when compiling the plugin. * configure.ac: Determine a collapsed (comparable) version that can be used by the preprocessor for conditional compilation. Cheers, Deepak -------------- next part -------------- diff -r be7c5293ac85 IcedTeaPlugin.cc --- a/IcedTeaPlugin.cc Tue May 05 13:30:07 2009 +0200 +++ b/IcedTeaPlugin.cc Tue May 05 10:22:27 2009 -0400 @@ -3938,7 +3938,11 @@ } PLUGIN_DEBUG_TWO ("created output fifo:", out_pipe_name); +#if MOZILLA_VERSION_COLLAPSED < 1090100 result = applet_viewer_process->Run (PR_FALSE, args, numArgs, nsnull); +#else + result = applet_viewer_process->Run (PR_FALSE, args, numArgs); +#endif PLUGIN_CHECK_RETURN ("run process", result); out_to_appletviewer = g_io_channel_new_file (out_pipe_name, diff -r be7c5293ac85 Makefile.am --- a/Makefile.am Tue May 05 13:30:07 2009 +0200 +++ b/Makefile.am Tue May 05 10:22:27 2009 -0400 @@ -1654,6 +1654,7 @@ $(CXX) $(CXXFLAGS) \ -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ -DPLUGIN_VERSION="\"$$plugin_version\"" \ + -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \ $(GTK_CFLAGS) \ $(XULRUNNER_CFLAGS) \ -fPIC -c -o $@ $< diff -r be7c5293ac85 configure.ac --- a/configure.ac Tue May 05 13:30:07 2009 +0200 +++ b/configure.ac Tue May 05 10:22:27 2009 -0400 @@ -509,6 +509,54 @@ fi fi +AC_LANG_PUSH([C++]) +OLDCPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" + +AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +#include +#include +#include +#include +#include +]],[[ +int version = 0; +const char* token = NULL; +int power=6; +FILE *datafile; + +datafile = fopen ("conftest.vdata", "w"); +if (!datafile) return 1; + +// 32 chars is more than enough to hold version +char* mozilla_version = (char*) malloc(32*sizeof(char)); +snprintf(mozilla_version, 32, "%s", MOZILLA_VERSION); + +token = strtok(mozilla_version, "."); +while (token) +{ + version += atoi(token)*(pow(10, power)); + power -=2; + token = strtok(NULL, "."); +} + +fprintf (datafile, "%d\n", version); +if (fclose(datafile)) return 1; + +return EXIT_SUCCESS; +]])], + [xulrunner_cv_collapsed_version="$(cat conftest.vdata)"], + [AC_MSG_FAILURE([cannot determine xulrunner version])])], + [xulrunner_cv_collapsed_version="190000"]) + +CPPFLAGS="$OLDCPPFLAGS" +AC_LANG_POP([C++]) + +AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) + + AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms, AC_HELP_STRING([--with-additional-vms=vm-list], [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]), From aph at redhat.com Tue May 5 07:30:41 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 05 May 2009 15:30:41 +0100 Subject: Zero and Shark patch refactoring In-Reply-To: <20090505132324.GB3488@redhat.com> References: <20090505132324.GB3488@redhat.com> Message-ID: <4A004D91.9090905@redhat.com> Gary Benson wrote: > As a prelude to upstreaming Zero and Shark I want to alter the > makefiles to apply Zero and Shark patches for all builds. This > shouldn't cause any problems (everything is conditional) and > since this is how they'll be when they're upstream it'd be good > to get some initial testing. Does anybody have any problems > with this? This sounds like a good idea, and it's certainly a prerequisite for pushing Zero upstream. Andrew. From gnu_andrew at member.fsf.org Tue May 5 07:34:53 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 5 May 2009 15:34:53 +0100 Subject: Zero and Shark patch refactoring In-Reply-To: <20090505132324.GB3488@redhat.com> References: <20090505132324.GB3488@redhat.com> Message-ID: <17c6771e0905050734q2f6c7370s455dc9d803b47700@mail.gmail.com> 2009/5/5 Gary Benson : > Hi all, > > As a prelude to upstreaming Zero and Shark I want to alter the > makefiles to apply Zero and Shark patches for all builds. ?This > shouldn't cause any problems (everything is conditional) and > since this is how they'll be when they're upstream it'd be good > to get some initial testing. ?Does anybody have any problems > with this? > No, in fact this would be great. I'd like to get Zero/Shark in the IcedTea forest for 7 rather than having to maintain them as patches and this will make it more feasible. > Also, to make this easier I'd like to get rid of the stuff for > building Zero using the bundled HotSpot. ?Is anybody still using > Zero like that? > I thought we'd already dropped some of it and we did say we would after 1.4. Make sure to update the patch list (http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches) for those you removed (I already highlighted a few). > Cheers, > Gary > > -- > http://gbenson.net/ > -- 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 Tue May 5 08:01:24 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Tue, 05 May 2009 15:01:24 +0000 Subject: changeset in /hg/icedtea6: 2009-05-05 Matthias Klose changeset 3fc3144c4fef in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3fc3144c4fef description: 2009-05-05 Matthias Klose * configure.ac: Building --with-additional-vms=zero and srcdir != builddir doesn't work. diffstat: 2 files changed, 8 insertions(+) ChangeLog | 5 +++++ configure.ac | 3 +++ diffs (25 lines): diff -r be7c5293ac85 -r 3fc3144c4fef ChangeLog --- a/ChangeLog Tue May 05 13:30:07 2009 +0200 +++ b/ChangeLog Tue May 05 16:57:03 2009 +0200 @@ -1,3 +1,8 @@ 2009-05-05 Xerxes R??nby + + * configure.ac: Building --with-additional-vms=zero and + srcdir != builddir doesn't work. + 2009-05-05 Xerxes R??nby * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp diff -r be7c5293ac85 -r 3fc3144c4fef configure.ac --- a/configure.ac Tue May 05 13:30:07 2009 +0200 +++ b/configure.ac Tue May 05 16:57:03 2009 +0200 @@ -540,6 +540,9 @@ if test "x${USE_SYSTEM_CACAO_TRUE}" = x; if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then AC_MSG_ERROR([cannot build with system cacao as additional vm]) fi +if test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${abs_top_builddir}" = "x${abs_top_srcdir}"; then + AC_MSG_ERROR([build of additional zero/shark VM requires build with srcdir != builddir]) +fi if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then dnl Check for libffi headers and libraries. From bugzilla-daemon at icedtea.classpath.org Tue May 5 08:15:39 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 05 May 2009 15:15:39 +0000 Subject: [Bug 313] "make hotspot" errors Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=313 langel at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #2 from langel at redhat.com 2009-05-05 15:15 ------- fixed upstream -- 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 doko at ubuntu.com Tue May 5 08:16:46 2009 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 05 May 2009 17:16:46 +0200 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <49FF3272.1020205@redhat.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> Message-ID: <4A00585E.1080006@ubuntu.com> Lillian Angel schrieb: > Lillian Angel wrote: >> Hi, >> >> I would like to have a release in the new future, which includes the >> new b16 update and several important improvements to the plugin. >> >> Any objections or suggestions? >> >> >> Cheers, >> Lillian > > There is still quite a bit of work to be done for the upcoming 1.5 > release, but I have cloned the main repo: > http://icedtea.classpath.org/hg/release/icedtea6-1.5/ > > It has not been tagged yet, but continue to commit to the main repo and > I will update the 1.5 one when we are ready to go. As of today I cannot see any updates which should not be applied to the branch. I'd like to have the --with-additional-vms option as part of the release. The one known outstanding issue is the cacao-no-mmap patch, waiting for feedback from the cacao maintainers. I cannot comment on the state of shark, but being able to build shark with recent llvm versions would be a plus. Is the cleanup for the original hotspot planned for inclusion in the release as well? The CVE's for the batch of security patches should be mentioned in the NEWS file, not sure which ones ... Matthias From langel at redhat.com Tue May 5 08:25:52 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 05 May 2009 15:25:52 +0000 Subject: changeset in /hg/icedtea6: 2009-05-05 Lillian Angel changeset 50da1d3efe60 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=50da1d3efe60 description: 2009-05-05 Lillian Angel Fixes BZ#313 * Makefile.am (hotspot): Fixes paths and creates server directory before copy. diffstat: 2 files changed, 10 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 6 ++++-- diffs (35 lines): diff -r 3fc3144c4fef -r 50da1d3efe60 ChangeLog --- a/ChangeLog Tue May 05 16:57:03 2009 +0200 +++ b/ChangeLog Tue May 05 11:26:38 2009 -0400 @@ -1,3 +1,9 @@ 2009-05-05 Matthias Klose + + Fixes BZ#313 + * Makefile.am + (hotspot): Fixes paths and creates server directory before copy. + 2009-05-05 Matthias Klose * configure.ac: Building --with-additional-vms=zero and diff -r 3fc3144c4fef -r 50da1d3efe60 Makefile.am --- a/Makefile.am Tue May 05 16:57:03 2009 +0200 +++ b/Makefile.am Tue May 05 11:26:38 2009 -0400 @@ -1328,14 +1328,16 @@ stamps/icedtea-ecj.stamp: stamps/bootstr mkdir -p stamps touch stamps/icedtea-ecj.stamp -SERVER_DIR = hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/server +SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server hotspot: rm -f stamps/bootstrap-directory-symlink-ecj.stamp rm -f stamps/icedtea-ecj.stamp rm -f stamps/icedtea-against-ecj.stamp $(ARCH_PREFIX) $(MAKE) hotspot-helper + mkdir -p \ + $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ - $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/server + $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \ From langel at redhat.com Tue May 5 08:28:48 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 05 May 2009 11:28:48 -0400 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <4A00585E.1080006@ubuntu.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> <4A00585E.1080006@ubuntu.com> Message-ID: <4A005B30.6030403@redhat.com> Matthias Klose wrote: > Lillian Angel schrieb: > >> Lillian Angel wrote: >> >>> Hi, >>> >>> I would like to have a release in the new future, which includes the >>> new b16 update and several important improvements to the plugin. >>> >>> Any objections or suggestions? >>> >>> >>> Cheers, >>> Lillian >>> >> There is still quite a bit of work to be done for the upcoming 1.5 >> release, but I have cloned the main repo: >> http://icedtea.classpath.org/hg/release/icedtea6-1.5/ >> >> It has not been tagged yet, but continue to commit to the main repo and >> I will update the 1.5 one when we are ready to go. >> > > As of today I cannot see any updates which should not be applied to the branch. > I'd like to have the --with-additional-vms option as part of the release. The > one known outstanding issue is the cacao-no-mmap patch, waiting for feedback > from the cacao maintainers. > I will update the branch when everyone is ready to go ahead. > I cannot comment on the state of shark, but being able to build shark with > recent llvm versions would be a plus. > > Is the cleanup for the original hotspot planned for inclusion in the release as > well? > Yes, I hope it wont be too long. That is the only thing we are waiting for. > The CVE's for the batch of security patches should be mentioned in the NEWS > file, not sure which ones ... Thanks, I will be sure to do that. Thanks, Lillian From doko at ubuntu.com Tue May 5 08:43:54 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Tue, 05 May 2009 15:43:54 +0000 Subject: changeset in /hg/icedtea6: 2009-05-05 Matthias Klose changeset 92ccab483b7a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=92ccab483b7a description: 2009-05-05 Matthias Klose * patches/icedtea-fonts.patch: Update fontconfig for Ubuntu. diffstat: 2 files changed, 386 insertions(+) ChangeLog | 4 patches/icedtea-fonts.patch | 382 +++++++++++++++++++++++++++++++++++++++++++ diffs (400 lines): diff -r 50da1d3efe60 -r 92ccab483b7a ChangeLog --- a/ChangeLog Tue May 05 11:26:38 2009 -0400 +++ b/ChangeLog Tue May 05 17:39:30 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-05 Lillian Angel + + * patches/icedtea-fonts.patch: Update fontconfig for Ubuntu. + 2009-05-05 Lillian Angel Fixes BZ#313 diff -r 50da1d3efe60 -r 92ccab483b7a patches/icedtea-fonts.patch --- a/patches/icedtea-fonts.patch Tue May 05 11:26:38 2009 -0400 +++ b/patches/icedtea-fonts.patch Tue May 05 17:39:30 2009 +0200 @@ -399,3 +399,385 @@ +filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf +filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf + +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig 2009-05-05 15:35:28.000000000 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-05 15:36:52.000000000 +0000 +@@ -25,106 +25,253 @@ + + # Version + +-# Uses Ubuntu 6.10 (Edgy) fonts and file paths. ++# Uses Ubuntu 8.04 (hardy) (and more recent releases) fonts and file paths. + version=1 + + # Component Font Mappings + +-dialog.plain.latin-1=DejaVu Sans +-dialog.plain.japanese-x0208=Kochi Gothic +-dialog.plain.korean=Baekmuk Dotum ++# Chinese fonts ++allfonts.umingcn=AR PL UMing CN ++#allfonts.umingcn.motif=AR PL UMing CN ++allfonts.uminghk=AR PL UMing HK ++#allfonts.uminghk.motif=AR PL UMing HK ++allfonts.umingtw=AR PL UMing TW ++#allfonts.umingtw.motif=AR PL UMing TW ++allfonts.wqy-zenhei=WenQuanYi Zen Hei ++#allfonts.wqy-zenhei.motif=WenQuanYi Zen Hei ++allfonts.shanheisun=AR PL ShanHeiSun Uni ++#allfonts.shanheisun.motif=AR PL ShanHeiSun Uni ++ ++# Indic scripts ++allfonts.bengali=Lohit Bengali ++allfonts.gujarati=Lohit Gujarati ++allfonts.hindi=Lohit Hindi ++#allfonts.malayalam=Lohit Malayalam ++allfonts.oriya=Lohit Oriya ++allfonts.punjabi=Lohit Punjabi ++allfonts.tamil=Lohit Tamil ++allfonts.telugu=Lohit Telugu ++allfonts.sinhala=LKLUG + +-dialog.bold.latin-1=DejaVu Sans Bold +-dialog.bold.japanese-x0208=Kochi Gothic +-dialog.bold.korean=Baekmuk Dotum + +-dialog.italic.latin-1=DejaVu Sans Oblique +-dialog.italic.japanese-x0208=Kochi Gothic +-dialog.italic.korean=Baekmuk Dotum ++serif.plain.latin-1=DejaVu Serif ++#serif.plain.latin-1.motif=LuxiSerif-Regular ++serif.plain.japanese-kochi=Kochi Mincho ++serif.plain.japanese-sazanami=Sazanami Mincho ++serif.plain.japanese-vlgothic=Kochi Mincho ++serif.plain.korean-baekmuk=Baekmuk Batang ++#serif.plain.korean-baekmuk.motif=Baekmuk Batang ++serif.plain.korean-un=UnBatang ++#serif.plain.korean-un.motif=UnBatang + +-dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique +-dialog.bolditalic.japanese-x0208=Kochi Gothic +-dialog.bolditalic.korean=Baekmuk Dotum ++serif.bold.latin-1=DejaVu Serif Bold ++#serif.bold.latin-1.motif=LuxiSerif-Bold ++serif.bold.japanese-kochi=Kochi Mincho ++serif.bold.japanese-sazanami=Sazanami Mincho ++serif.bold.japanese-vlgothic=Kochi Mincho ++serif.bold.korean-baekmuk=Baekmuk Batang ++#serif.bold.korean-baekmuk.motif=Baekmuk Batang ++serif.bold.korean-un=UnBatang Bold ++#serif.bold.korean-un.motif=UnBatang Bold ++ ++serif.italic.latin-1=DejaVu Serif Oblique ++#serif.italic.latin-1.motif=LuxiSerif-Oblique ++serif.italic.japanese-kochi=Kochi Mincho ++serif.italic.japanese-sazanami=Sazanami Mincho ++serif.italic.japanese-vlgothic=Kochi Mincho ++serif.italic.korean-baekmuk=Baekmuk Batang ++#serif.italic.korean-baekmuk.motif=Baekmuk Batang ++serif.italic.korean-un=UnBatang ++#serif.italic.korean-un.motif=UnBatang + ++serif.bolditalic.latin-1=DejaVu Serif Bold Oblique ++#serif.bolditalic.latin-1.motif=LuxiSerif-BoldOblique ++serif.bolditalic.japanese-kochi=Kochi Mincho ++serif.bolditalic.japanese-sazanami=Sazanami Mincho ++serif.bolditalic.japanese-vlgothic=Kochi Mincho ++serif.bolditalic.korean-baekmuk=Baekmuk Batang ++#serif.bolditalic.korean-baekmuk.motif=Baekmuk Batang ++serif.bolditalic.korean-un=UnBatang Bold ++#serif.bolditalic.korean-un.motif=UnBatang Bold + + sansserif.plain.latin-1=DejaVu Sans +-sansserif.plain.japanese-x0208=Kochi Gothic +-sansserif.plain.korean=Baekmuk Dotum ++#sansserif.plain.latin-1.motif=LuxiSans-Regular ++sansserif.plain.japanese-kochi=Kochi Gothic ++sansserif.plain.japanese-sazanami=Sazanami Gothic ++sansserif.plain.japanese-vlgothic=VL PGothic ++sansserif.plain.korean-baekmuk=Baekmuk Gulim ++#sansserif.plain.korean-baekmuk.motif=Baekmuk Gulim ++sansserif.plain.korean-un=UnDotum ++#sansserif.plain.korean-un.motif=UnDotum + + sansserif.bold.latin-1=DejaVu Sans Bold +-sansserif.bold.japanese-x0208=Kochi Gothic +-sansserif.bold.korean=Baekmuk Dotum ++#sansserif.bold.latin-1.motif=LuxiSans-Bold ++sansserif.bold.japanese-kochi=Kochi Gothic ++sansserif.bold.japanese-sazanami=Sazanami Gothic ++sansserif.bold.japanese-vlgothic=VL PGothic ++sansserif.bold.korean-baekmuk=Baekmuk Gulim ++#sansserif.bold.korean-baekmuk.motif=Baekmuk Gulim ++sansserif.bold.korean-un=UnDotum Bold ++#sansserif.bold.korean-un.motif=UnDotum Bold + + sansserif.italic.latin-1=DejaVu Sans Oblique +-sansserif.italic.japanese-x0208=Kochi Gothic +-sansserif.italic.korean=Baekmuk Dotum ++#sansserif.italic.latin-1.motif=LuxiSans-Oblique ++sansserif.italic.japanese-kochi=Kochi Gothic ++sansserif.italic.japanese-sazanami=Sazanami Gothic ++sansserif.italic.japanese-vlgothic=VL PGothic ++sansserif.italic.korean-baekmuk=Baekmuk Gulim ++#sansserif.italic.korean-baekmuk.motif=Baekmuk Gulim ++sansserif.italic.korean-un=UnDotum ++#sansserif.italic.korean-un.motif=UnDotum + + sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique +-sansserif.bolditalic.japanese-x0208=Kochi Gothic +-sansserif.bolditalic.korean=Baekmuk Dotum +- +- +-serif.plain.latin-1=DejaVu Serif +-serif.plain.japanese-x0208=Kochi Mincho +-serif.plain.korean=Baekmuk Batang +- +-serif.bold.latin-1=DejaVu Serif Bold +-serif.bold.japanese-x0208=Kochi Mincho +-serif.bold.korean=Baekmuk Batang +- +-serif.italic.latin-1=DejaVu Serif Oblique +-serif.italic.japanese-x0208=Kochi Mincho +-serif.italic.korean=Baekmuk Batang +- +-serif.bolditalic.latin-1=DejaVu Serif Bold Oblique +-serif.bolditalic.japanese-x0208=Kochi Mincho +-serif.bolditalic.korean=Baekmuk Batang +- ++#sansserif.bolditalic.latin-1.motif=LuxiSans-BoldOblique ++sansserif.bolditalic.japanese-kochi=Kochi Gothic ++sansserif.bolditalic.japanese-sazanami=Sazanami Gothic ++sansserif.bolditalic.japanese-vlgothic=VL PGothic ++sansserif.bolditalic.korean-baekmuk=Baekmuk Gulim ++#sansserif.bolditalic.korean-baekmuk.motif=Baekmuk Gulim ++sansserif.bolditalic.korean-un=UnDotum Bold ++#sansserif.bolditalic.korean-un.motif=UnDotum Bold + + monospaced.plain.latin-1=DejaVu Sans Mono +-monospaced.plain.japanese-x0208=Kochi Gothic +-monospaced.plain.korean=Baekmuk Dotum ++#monospaced.plain.latin-1.motif=LuxiMono-Regular ++monospaced.plain.japanese-kochi=Kochi Gothic ++monospaced.plain.japanese-sazanami=Sazanami Gothic ++monospaced.plain.japanese-vlgothic=VL Gothic ++monospaced.plain.korean-baekmuk=Baekmuk Gulim ++#monospaced.plain.korean-baekmuk.motif=Baekmuk Gulim ++monospaced.plain.korean-un=UnDotum ++#monospaced.plain.korean-un.motif=UnDotum + + monospaced.bold.latin-1=DejaVu Sans Mono Bold +-monospaced.bold.japanese-x0208=Kochi Gothic +-monospaced.bold.korean=Baekmuk Dotum ++#monospaced.bold.latin-1.motif=LuxiMono-Bold ++monospaced.bold.japanese-kochi=Kochi Gothic ++monospaced.bold.japanese-sazanami=Sazanami Gothic ++monospaced.bold.japanese-vlgothic=VL Gothic ++monospaced.bold.korean-baekmuk=Baekmuk Gulim ++#monospaced.bold.korean-baekmuk.motif=Baekmuk Gulim ++monospaced.bold.korean-un=UnDotum Bold ++#monospaced.bold.korean-un.motif=UnDotum Bold + + monospaced.italic.latin-1=DejaVu Sans Mono Oblique +-monospaced.italic.japanese-x0208=Kochi Gothic +-monospaced.italic.korean=Baekmuk Dotum ++#monospaced.italic.latin-1.motif=LuxiMono-Oblique ++monospaced.italic.japanese-kochi=Kochi Gothic ++monospaced.italic.japanese-sazanami=Sazanami Gothic ++monospaced.italic.japanese-vlgothic=VL Gothic ++monospaced.italic.korean-baekmuk=Baekmuk Gulim ++#monospaced.italic.korean-baekmuk.motif=Baekmuk Gulim ++monospaced.italic.korean-un=UnDotum ++#monospaced.italic.korean-un.motif=UnDotum + + monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique +-monospaced.bolditalic.japanese-x0208=Kochi Gothic +-monospaced.bolditalic.korean=Baekmuk Dotum ++#monospaced.bolditalic.latin-1.motif=LuxiMono-BoldOblique ++monospaced.bolditalic.japanese-kochi=Kochi Gothic ++monospaced.bolditalic.japanese-sazanami=Sazanami Gothic ++monospaced.bolditalic.japanese-vlgothic=VL Gothic ++monospaced.bolditalic.korean-baekmuk=Baekmuk Gulim ++#monospaced.bolditalic.korean-baekmuk.motif=Baekmuk Gulim ++monospaced.bolditalic.korean-un=UnDotum Bold ++#monospaced.bolditalic.korean-un.motif=UnDotum Bold ++ ++dialog.plain.latin-1=DejaVu Sans ++#dialog.plain.latin-1.motif=LuxiSans-Regular ++dialog.plain.japanese-kochi=Kochi Gothic ++dialog.plain.japanese-sazanami=Sazanami Gothic ++dialog.plain.japanese-vlgothic=VL PGothic ++dialog.plain.korean-baekmuk=Baekmuk Gulim ++#dialog.plain.korean-baekmuk.motif=Baekmuk Gulim ++dialog.plain.korean-un=UnDotum ++#dialog.plain.korean-un.motif=UnDotum + ++dialog.bold.latin-1=DejaVu Sans Bold ++#dialog.bold.latin-1.motif=LuxiSans-Bold ++dialog.bold.japanese-kochi=Kochi Gothic ++dialog.bold.japanese-sazanami=Sazanami Gothic ++dialog.bold.japanese-vlgothic=VL PGothic ++dialog.bold.korean-baekmuk=Baekmuk Gulim ++#dialog.bold.korean-baekmuk.motif=Baekmuk Gulim ++dialog.bold.korean-un=UnDotum Bold ++#dialog.bold.korean-un.motif=UnDotum Bold ++ ++dialog.italic.latin-1=DejaVu Sans Oblique ++#dialog.italic.latin-1.motif=LuxiSans-Oblique ++dialog.italic.japanese-kochi=Kochi Gothic ++dialog.italic.japanese-sazanami=Sazanami Gothic ++dialog.italic.japanese-vlgothic=VL PGothic ++dialog.italic.korean-baekmuk=Baekmuk Gulim ++#dialog.italic.korean-baekmuk.motif=Baekmuk Gulim ++dialog.italic.korean-un=UnDotum ++#dialog.italic.korean-un.motif=UnDotum ++ ++dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique ++#dialog.bolditalic.latin-1.motif=LuxiSans-BoldOblique ++dialog.bolditalic.japanese-kochi=Kochi Gothic ++dialog.bolditalic.japanese-sazanami=Sazanami Gothic ++dialog.bolditalic.japanese-vlgothic=VL PGothic ++dialog.bolditalic.korean-baekmuk=Baekmuk Gulim ++#dialog.bolditalic.korean-baekmuk.motif=Baekmuk Gulim ++dialog.bolditalic.korean-un=UnDotum Bold ++#dialog.bolditalic.korean-un.motif=UnDotum Bold + + dialoginput.plain.latin-1=DejaVu Sans Mono +-dialoginput.plain.japanese-x0208=Kochi Gothic +-dialoginput.plain.korean=Baekmuk Dotum ++#dialoginput.plain.latin-1.motif=LuxiMono-Regular ++dialoginput.plain.japanese-kochi=Kochi Gothic ++dialoginput.plain.japanese-sazanami=Sazanami Gothic ++dialoginput.plain.japanese-vlgothic=VL Gothic ++dialoginput.plain.korean-baekmuk=Baekmuk Gulim ++#dialoginput.plain.korean-baekmuk.motif=Baekmuk Gulim ++dialoginput.plain.korean-un=UnDotum ++#dialoginput.plain.korean-un.motif=UnDotum + + dialoginput.bold.latin-1=DejaVu Sans Mono Bold +-dialoginput.bold.japanese-x0208=Kochi Gothic +-dialoginput.bold.korean=Baekmuk Dotum ++#dialoginput.bold.latin-1.motif=LuxiMono-Bold ++dialoginput.bold.japanese-kochi=Kochi Gothic ++dialoginput.bold.japanese-sazanami=Sazanami Gothic ++dialoginput.bold.japanese-vlgothic=VL Gothic ++dialoginput.bold.korean-baekmuk=Baekmuk Gulim ++#dialoginput.bold.korean-baekmuk.motif=Baekmuk Gulim ++dialoginput.bold.korean-un=UnDotum Bold ++#dialoginput.bold.korean-un.motif=UnDotum Bold + + dialoginput.italic.latin-1=DejaVu Sans Mono Oblique +-dialoginput.italic.japanese-x0208=Kochi Gothic +-dialoginput.italic.korean=Baekmuk Dotum ++#dialoginput.italic.latin-1.motif=LuxiMono-Oblique ++dialoginput.italic.japanese-kochi=Kochi Gothic ++dialoginput.italic.japanese-sazanami=Sazanami Gothic ++dialoginput.italic.japanese-vlgothic=VL Gothic ++dialoginput.italic.korean-baekmuk=Baekmuk Gulim ++#dialoginput.italic.korean-baekmuk.motif=Baekmuk Gulim ++dialoginput.italic.korean-un=UnDotum ++#dialoginput.italic.korean-un.motif=UnDotum + + dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique +-dialoginput.bolditalic.japanese-x0208=Kochi Gothic +-dialoginput.bolditalic.korean=Baekmuk Dotum +- +-allfonts.chinese-big5=AR PL ZenKai Uni +-allfonts.chinese-gb18030=AR PL ZenKai Uni ++#dialoginput.bolditalic.latin-1.motif=LuxiMono-BoldOblique ++dialoginput.bolditalic.japanese-kochi=Kochi Gothic ++dialoginput.bolditalic.japanese-sazanami=Sazanami Gothic ++dialoginput.bolditalic.japanese-vlgothic=VL Gothic ++dialoginput.bolditalic.korean-baekmuk=Baekmuk Gulim ++#dialoginput.bolditalic.korean-baekmuk.motif=Baekmuk Gulim ++dialoginput.bolditalic.korean-un=UnDotum Bold ++#dialoginput.bolditalic.korean-un.motif=UnDotum Bold + + # Search Sequences + + sequence.allfonts=latin-1 +-sequence.allfonts.Big5=chinese-big5,latin-1 +-sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1 +-sequence.allfonts.EUC-KR=korean,latin-1 +-sequence.allfonts.GB18030=chinese-gb18030,latin-1 +-sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean ++sequence.allfonts.GB18030=latin-1,umingcn,shanheisun,wqy-zenhei ++sequence.allfonts.GB2312=latin-1,umingcn,shanheisun,wqy-zenhei ++sequence.allfonts.GBK=latin-1,umingcn,shanheisun,wqy-zenhei ++sequence.allfonts.x-euc-jp-linux=latin-1,japanese-vlgothic,japanese-kochi,japanese-sazanami ++sequence.allfonts.EUC-KR=latin-1,korean-un,korean-baekmuk ++sequence.allfonts.Big5=latin-1,umingtw,shanheisun,wqy-zenhei ++sequence.allfonts.Big5-HKSCS=latin-1,uminghk,shanheisun,wqy-zenhei ++#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala ++sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu ++ ++# Exclusion Ranges ++ ++exclusion.japanese-kochi=0390-03d6,2200-22ef,2701-27be ++exclusion.japanese-sazanami=0390-03d6,2200-22ef,2701-27be ++exclusion.japanese-vlgothic=0390-03d6,2200-22ef,2701-27be + + # Font File Names + +@@ -143,8 +290,58 @@ + filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf + filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf + +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf +-filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf +-filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf ++filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc ++filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc ++filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf ++ ++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf + filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf ++filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf ++filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf ++filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf ++filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf ++filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf ++filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf ++filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf ++filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf ++#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf ++ ++filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf ++filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf ++filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf ++filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf ++filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf ++filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf ++filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf ++filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf ++filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf ++filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf ++filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf ++filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf ++ ++# AWT X11 font paths ++awtfontpath.latin-1=/usr/share/fonts/X11/Type1 ++awtfontpath.umingcn=/usr/share/fonts/truetype/arphic ++awtfontpath.uminghk=/usr/share/fonts/truetype/arphic ++awtfontpath.umingtw=/usr/share/fonts/truetype/arphic ++awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic ++awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy ++awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi ++awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami ++awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic ++awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk ++awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts From gnu_andrew at member.fsf.org Tue May 5 08:51:25 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 5 May 2009 16:51:25 +0100 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <49F9F971.1010404@sun.com> References: <20090212150029.GA1121@rivendell.middle-earth.co.uk> <1234768690.24153.28.camel@localhost.localdomain> <1234772748.3612.3.camel@hermans.wildebeest.org> <1234774554.11228.3.camel@localhost.localdomain> <1234862105.4062.8.camel@fedora.wildebeest.org> <499B727D.6060901@sun.com> <17c6771e0903200428j75e26899x9c15daf57f5ed20e@mail.gmail.com> <49E3ABEA.6020400@sun.com> <1241001697.4267.1.camel@fedora.wildebeest.org> <49F9F971.1010404@sun.com> Message-ID: <17c6771e0905050851u70e44df4oba96c6c7d3e1363b@mail.gmail.com> 2009/4/30 David Cox : > Mark Wielaard wrote: > > Hi Joe, > > On Mon, 2009-04-13 at 14:17 -0700, Joseph D. Darcy wrote: > > > Andrew John Hughes wrote: > > > 2009/2/18 Joe Darcy : > > > On 02/17/09 01:15 AM, Mark Wielaard wrote: > So it would be good to have an open repo that hosts the HS14 stable > build so that people interested in a stable, but modern, hotspot could > base their work on that. Since IcedTea6 is trying to standardize on HS14 > for the default hotspot and the one that Zero and Shark are based on I > could create a icedtea/hotspot repo branched from the latest HS14 code > in the jdk7/jdk7/hotspot repo. Would that be interesting to others? How > do we coordinate backporting fixes to it? Any other suggestions for > hosting an open hotspot HS14 repo (maybe as subtree of one of the other > 6 hotspot repos under jdk7/hostspot-* (I admit to not know what they are > all for currently). > > I have been talking with the HotSpot team inside Sun about the logistics > needed to support a public HotSpot Mercurial repository usable by both > OpenJDK 6 and the 6 update release, which would mean the stabilized HotSpot > 14 at this point. > > We should have something figured out relatively soon; I'll post when we do. > > > Any news on this? > > > Some news should be available real soon now... > > > Great. Do you hav any estimates on when "real soon now" will be? > > > "Real soon now" is now, finally.? We at Sun have been discussing the idea of > creating a "HotSpot Express" Project in OpenJDK through which the > stabilization of new versions of HotSpot could be managed.? We could create > repositories such as > > ? http://hg.openjdk.java.net/hsx/14/baseline > ? http://hg.openjdk.java.net/hsx/14/master > > and > > ? http://hg.openjdk.java.net/hsx/15/baseline > ? http://hg.openjdk.java.net/hsx/15/master > > in which this work would be done.? A "baseline" repo would be used to > collect suitable bug fixes from developers.? Occasionally, these changes > would be pushed to "master" to form the basis of a stable build. ? This is > the model we've used at Sun for many years.? If it seems reasonable to > folks, I'll ask one of HotSpot Group members to submit a formal project > proposal for consideration (Although I'm the manager of Sun's HotSpot > garbage collection and compiler teams,? I'm not actually a member of the > group!) > > Dave > Any idea when these repositories will appear? 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 Dalibor.Topic at Sun.COM Tue May 5 10:32:36 2009 From: Dalibor.Topic at Sun.COM (Dalibor Topic) Date: Tue, 05 May 2009 10:32:36 -0700 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <17c6771e0905050851u70e44df4oba96c6c7d3e1363b@mail.gmail.com> References: <20090212150029.GA1121@rivendell.middle-earth.co.uk> <1234768690.24153.28.camel@localhost.localdomain> <1234772748.3612.3.camel@hermans.wildebeest.org> <1234774554.11228.3.camel@localhost.localdomain> <1234862105.4062.8.camel@fedora.wildebeest.org> <499B727D.6060901@sun.com> <17c6771e0903200428j75e26899x9c15daf57f5ed20e@mail.gmail.com> <49E3ABEA.6020400@sun.com> <1241001697.4267.1.camel@fedora.wildebeest.org> <49F9F971.1010404@sun.com> <17c6771e0905050851u70e44df4oba96c6c7d3e1363b@mail.gmail.com> Message-ID: <4A007834.1090502@sun.com> Andrew John Hughes wrote: > Any idea when these repositories will appear? We'll need a "HotSpot Express" project proposal first. Dave, you can use one of my proposals as a template - if there is anything you need assistance with, I'm available today before 1pm and after 2pm. cheers, dalibor topic -- ******************************************************************* Dalibor Topic Tel: (+49 40) 23 646 738 Java F/OSS Ambassador AIM: robiladonaim Sun Microsystems GmbH Mobile: (+49 177) 2664 192 Nagelsweg 55 http://openjdk.java.net D-20097 Hamburg mailto:Dalibor.Topic at sun.com Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten Amtsgericht M?nchen: HRB 161028 Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Wolf Frenkel Vorsitzender des Aufsichtsrates: Martin H?ring From aph at redhat.com Tue May 5 10:50:18 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 05 May 2009 18:50:18 +0100 Subject: Patch for Bug #331 (compiling with xulrunner 1.9.1) In-Reply-To: <20090505142947.GA3517@redhat.com> References: <20090505142947.GA3517@redhat.com> Message-ID: <4A007C5A.3080008@redhat.com> Deepak Bhole wrote: > Attached patch adds conditional compilation for the plugin, so that > it can compile with xulrunner 1.9.1 and older versions. I have tested > the patch on an F10 box (xul 1.9.10) and rawhide (xul 1.9.1). > > Bug is here: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=331 > > ChangeLog: > 2009-05-05 Deepak Bhole > > * IcedTeaPlugin.cc: Add conditional compilation block. > * Makefile.am: Define a collapsed (comparable) version when compiling the > plugin. > * configure.ac: Determine a collapsed (comparable) version that can be > used by the preprocessor for conditional compilation. I agree. That looks like the best way to fix it. Andrew. From langel at redhat.com Tue May 5 11:33:37 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 05 May 2009 18:33:37 +0000 Subject: changeset in /hg/icedtea6: 2009-05-05 Lillian Angel changeset 0393ff6c8320 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0393ff6c8320 description: 2009-05-05 Lillian Angel * .hgignore: Added missing. diffstat: 2 files changed, 5 insertions(+) .hgignore | 1 + ChangeLog | 4 ++++ diffs (22 lines): diff -r 92ccab483b7a -r 0393ff6c8320 .hgignore --- a/.hgignore Tue May 05 17:39:30 2009 +0200 +++ b/.hgignore Tue May 05 14:34:24 2009 -0400 @@ -3,6 +3,7 @@ syntax: glob syntax: regexp configure +missing aclocal.m4 autom4te.cache cacao diff -r 92ccab483b7a -r 0393ff6c8320 ChangeLog --- a/ChangeLog Tue May 05 17:39:30 2009 +0200 +++ b/ChangeLog Tue May 05 14:34:24 2009 -0400 @@ -1,3 +1,7 @@ 2009-05-05 Matthias Klose + + * .hgignore: Added missing. + 2009-05-05 Matthias Klose * patches/icedtea-fonts.patch: Update fontconfig for Ubuntu. From langel at redhat.com Tue May 5 11:41:49 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 05 May 2009 18:41:49 +0000 Subject: changeset in /hg/icedtea6: Fixed Changelog formatting Message-ID: changeset a5006e51afe4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a5006e51afe4 description: Fixed Changelog formatting diffstat: 1 file changed, 28 insertions(+), 27 deletions(-) ChangeLog | 55 ++++++++++++++++++++++++++++--------------------------- diffs (223 lines): diff -r 0393ff6c8320 -r a5006e51afe4 ChangeLog --- a/ChangeLog Tue May 05 14:34:24 2009 -0400 +++ b/ChangeLog Tue May 05 14:42:36 2009 -0400 @@ -17,13 +17,13 @@ 2009-05-05 Matthias Klose +2009-05-05 Xerxes R??nby * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp (SharkCompiler::SharkCompiler): Use bool or enum to set JIT optimization dependent on the llvm version. - -2009-05-05 Xerxes R??nby + +2009-05-05 Xerxes R??nby * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from SHARK_LLVM_VERSION. @@ -159,10 +159,11 @@ 2009-05-01 Gary Benson +2009-04-30 Deepak Bhole * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Forgo - permission check if JS source is [System] (i.e. Mozilla extension/chrome). + permission check if JS source is [System] (i.e. Mozilla + extension/chrome). 2009-04-30 Matthias Klose @@ -195,7 +196,7 @@ 2009-04-29 Andrew John Hughes - Xerxes R??nby + Xerxes R??nby * configure.am (LLVM_CFLAGS): Add SHARK_LLVM_VERSION. * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp, @@ -254,7 +255,7 @@ 2009-04-28 Gary Benson +2009-04-27 Deepak Bhole * plugin/icedtea/sun/applet/PluginAppletViewer.java: Unescape " * rt/net/sourceforge/jnlp/runtime/Boot.java: Use custom authenticator for @@ -309,13 +310,13 @@ 2009-04-24 Lillian Angel +2009-04-24 Xerxes R??nby * patches/icedtea-jpegclasses.patch (openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java setJPEGEncodeParam): New function. -2009-04-23 Deepak Bhole +2009-04-23 Deepak Bhole * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Handle nested jars. @@ -324,7 +325,7 @@ 2009-04-23 Deepak Bhole +2009-04-23 Xerxes R??nby * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::init_external_functions): Use memory address to @@ -338,7 +339,7 @@ 2009-04-23 Xerxes R??nby +2009-04-23 Xerxes R??nby * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (zero_cmpxchg_int_fn): New function. @@ -391,12 +392,12 @@ 2009-04-16 Omair Majid - Xerxes R??nby + Xerxes R??nby * patches/icedtea-zero.patch (BytecodeInterpreter::run): Skip a bad assertion on IA32 with Zero. -2009-04-10 Deepak Bhole +2009-04-10 Deepak Bhole * IcedTeaPlugin.cc: Fix rhbz478561 (freeze with empty string return from Java side). @@ -430,7 +431,7 @@ 2009-04-03 Lillian Angel +2009-04-02 Deepak Bhole * IcedTeaPlugin.cc: Incremented timeout to 3 minutes. Added functions to process proxy and auth info requests (the latter is unused). @@ -620,7 +621,7 @@ 2009-03-21 Matthias Klose * patches/hotspot/*/icedtea-text-relocations.patch: Build hotspot - with -fPIC on alpha. + with -fPIC on alpha. 2009-03-21 Lillian Angel @@ -1155,7 +1156,7 @@ 2009-02-27 Gary Benson +2009-02-26 Deepak Bhole * IcedTeaPlugin.cc: Decode url via nsINetUtil::UnescapeString() * plugin/icedtea/sun/applet/PluginAppletViewer.java: Encode URL before @@ -1249,7 +1250,7 @@ 2009-02-26 Gary Benson +2009-02-25 Deepak Bhole * IcedTeaPlugin.cc: Implement Show/Hide from IJVMConsole, remove IJVMPerfWindow stubs, as they were empty and unused. @@ -1286,7 +1287,7 @@ 2009-02-24 Gary Benson +2009-02-23 Deepak Bhole * IcedTeaPlugin.cc: Supply cookie info to Java side. * plugin/icedtea/sun/applet/PluginAppletViewer.java: Apply patch from @@ -1520,7 +1521,7 @@ 2009-02-11 Andrew John Hughes +2009-02-10 Deepak Bhole * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Fix exit permissions for applets. @@ -1732,7 +1733,7 @@ 2009-01-22 Omair Majid +2009-01-22 Deepak Bhole * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Use Hashtable to store classloaders, instead of HashMap (values cannot be @@ -2821,7 +2822,7 @@ 2008-12-10 Matthias Klose +2008-12-10 Deepak Bhole * plugin/icedtea/sun/applet/PluginAppletViewer.java: Remove spurious call to getSecuritymanager() that was causing a CCE. @@ -4184,7 +4185,7 @@ 2008-10-15 Andrew John Hughes +2008-10-15 Xerxes R??nby * patches/icedtea-arch.patch: Update for m68k. @@ -4402,7 +4403,7 @@ 2008-10-03 Gary Benson +2008-10-01 Deepak Bhole * .hgignore: Removed IcedTeaPlugin.jar * IcedTeaPlugin.cc: Updated classpath when launching Java. added checks to detect error on Java side. @@ -4682,7 +4683,7 @@ 2008-09-12 Matthias Klose - Xerxes R??nby + Xerxes R??nby * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp (__m68k_cmpxchg): New function. @@ -4786,11 +4787,11 @@ 2008-08-15 Matthias Klose +2008-08-15 Xerxes Ranby * acinclude.m4: Fixed LIBGCJ_JAR check. -2008-08-15 Xerxes Ranby +2008-08-15 Xerxes Ranby * Makefile.am (CACAO_MD5SUM): Update for 0.99.3. @@ -6202,7 +6203,7 @@ 2008-04-09 Lillian Angel - Xerxes R??nby + Xerxes R??nby * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp (__kernel_cmpxchg_t): New type. From Erik.Trimble at Sun.COM Tue May 5 12:26:59 2009 From: Erik.Trimble at Sun.COM (Erik Trimble) Date: Tue, 05 May 2009 12:26:59 -0700 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <4A007834.1090502@sun.com> References: <20090212150029.GA1121@rivendell.middle-earth.co.uk> <1234768690.24153.28.camel@localhost.localdomain> <1234772748.3612.3.camel@hermans.wildebeest.org> <1234774554.11228.3.camel@localhost.localdomain> <1234862105.4062.8.camel@fedora.wildebeest.org> <499B727D.6060901@sun.com> <17c6771e0903200428j75e26899x9c15daf57f5ed20e@mail.gmail.com> <49E3ABEA.6020400@sun.com> <1241001697.4267.1.camel@fedora.wildebeest.org> <49F9F971.1010404@sun.com> <17c6771e0905050851u70e44df4oba96c6c7d3e1363b@mail.gmail.com> <4A007834.1090502@sun.com> Message-ID: <4A009303.9070607@sun.com> Dalibor Topic wrote: > Andrew John Hughes wrote: > >> Any idea when these repositories will appear? >> > > We'll need a "HotSpot Express" project proposal first. > > Dave, you can use one of my proposals as a template - > if there is anything you need assistance with, I'm > available today before 1pm and after 2pm. > > cheers, > dalibor topic > Dave's on vacation until Thursday. I'll likely be putting the project proposal out as soon as he comes back (i.e. no later than Friday). -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA Timezone: US/Pacific (GMT-0800) From dbhole at redhat.com Tue May 5 14:02:12 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 05 May 2009 21:02:12 +0000 Subject: changeset in /hg/icedtea6: Add conditional compilation to accomo... Message-ID: changeset 19e655aeb5fb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=19e655aeb5fb description: Add conditional compilation to accomodate changed api in xulrunner 1.9.1 diffstat: 4 files changed, 62 insertions(+) ChangeLog | 8 ++++++++ IcedTeaPlugin.cc | 4 ++++ Makefile.am | 1 + configure.ac | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ diffs (100 lines): diff -r a5006e51afe4 -r 19e655aeb5fb ChangeLog --- a/ChangeLog Tue May 05 14:42:36 2009 -0400 +++ b/ChangeLog Tue May 05 17:04:37 2009 -0400 @@ -1,3 +1,11 @@ 2009-05-05 Lillian Angel + + * IcedTeaPlugin.cc: Add conditional compilation block. + * Makefile.am: Define a collapsed (comparable) version when compiling the + plugin. + * configure.ac: Determine a collapsed (comparable) version that can be + used by the preprocessor for conditional compilation. + 2009-05-05 Lillian Angel * .hgignore: Added missing. diff -r a5006e51afe4 -r 19e655aeb5fb IcedTeaPlugin.cc --- a/IcedTeaPlugin.cc Tue May 05 14:42:36 2009 -0400 +++ b/IcedTeaPlugin.cc Tue May 05 17:04:37 2009 -0400 @@ -3938,7 +3938,11 @@ IcedTeaPluginFactory::StartAppletviewer } PLUGIN_DEBUG_TWO ("created output fifo:", out_pipe_name); +#if MOZILLA_VERSION_COLLAPSED < 1090100 result = applet_viewer_process->Run (PR_FALSE, args, numArgs, nsnull); +#else + result = applet_viewer_process->Run (PR_FALSE, args, numArgs); +#endif PLUGIN_CHECK_RETURN ("run process", result); out_to_appletviewer = g_io_channel_new_file (out_pipe_name, diff -r a5006e51afe4 -r 19e655aeb5fb Makefile.am --- a/Makefile.am Tue May 05 14:42:36 2009 -0400 +++ b/Makefile.am Tue May 05 17:04:37 2009 -0400 @@ -1656,6 +1656,7 @@ IcedTeaPlugin.o: IcedTeaPlugin.cc $(CXX) $(CXXFLAGS) \ -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ -DPLUGIN_VERSION="\"$$plugin_version\"" \ + -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \ $(GTK_CFLAGS) \ $(XULRUNNER_CFLAGS) \ -fPIC -c -o $@ $< diff -r a5006e51afe4 -r 19e655aeb5fb configure.ac --- a/configure.ac Tue May 05 14:42:36 2009 -0400 +++ b/configure.ac Tue May 05 17:04:37 2009 -0400 @@ -509,6 +509,55 @@ else fi fi +AC_LANG_PUSH([C++]) +OLDCPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" + +AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +#include +#include +#include +#include +#include +]],[[ +int version = 0; +const char* token = NULL; +int power=6; +FILE *datafile; + +datafile = fopen ("conftest.vdata", "w"); +if (!datafile) return 1; + +// 32 chars is more than enough to hold version +char* mozilla_version = (char*) malloc(32*sizeof(char)); +snprintf(mozilla_version, 32, "%s", MOZILLA_VERSION); + +token = strtok(mozilla_version, "."); +while (token) +{ + version += atoi(token)*(pow(10, power)); + power -=2; + token = strtok(NULL, "."); +} + +fprintf (datafile, "%d\n", version); +free(mozilla_version); +if (fclose(datafile)) return 1; + +return EXIT_SUCCESS; +]])], + [xulrunner_cv_collapsed_version="$(cat conftest.vdata)"], + [AC_MSG_FAILURE([cannot determine xulrunner version])])], + [xulrunner_cv_collapsed_version="190000"]) + +CPPFLAGS="$OLDCPPFLAGS" +AC_LANG_POP([C++]) + +AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) + + AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms, AC_HELP_STRING([--with-additional-vms=vm-list], [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]), From bugzilla-daemon at icedtea.classpath.org Tue May 5 14:05:31 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 05 May 2009 21:05:31 +0000 Subject: [Bug 331] IcedTeaPlugin.cc doesn't compile against xulrunner 1.9.1 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=331 dbhole at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #1 from dbhole at redhat.com 2009-05-05 21:05 ------- Fixed in trunk! -- 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 dbhole at redhat.com Tue May 5 14:10:34 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 5 May 2009 17:10:34 -0400 Subject: Patch to remove GCJ Web Plugin support Message-ID: <20090505211034.GA23367@redhat.com> Per the goals for 1.5, here is a patch that removes gcj web plugin support. ChangeLog: 2009-05-05 Deepak Bhole * Makefile.am: Remove GCJ Web Plugin support. * configure.ac: Ditto. Cheers, Deepak -------------- next part -------------- diff -r 19e655aeb5fb Makefile.am --- a/Makefile.am Tue May 05 17:04:37 2009 -0400 +++ b/Makefile.am Tue May 05 17:05:49 2009 -0400 @@ -8,12 +8,6 @@ NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380 VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe -if ENABLE_GCJWEBPLUGIN -GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin -GCJWEBPLUGIN_TARGET = gcjwebplugin.so -else -GCJWEBPLUGIN_CLEAN = -GCJWEBPLUGIN_TARGET = if ENABLE_PLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so @@ -22,9 +16,8 @@ else ICEDTEAPLUGIN_CLEAN = ICEDTEAPLUGIN_TARGET = -PLUGIN_PATCH = patches/icedtea-plugin.patch +PLUGIN_PATCH = LIVECONNECT_DIR = -endif endif if ENABLE_PULSE_JAVA @@ -68,9 +61,6 @@ if ENABLE_PLUGIN rm -f IcedTeaPlugin.o IcedTeaPlugin.so else -if ENABLE_GCJWEBPLUGIN - rm -f gcjwebplugin.so -endif endif if BUILD_CACAO rm -rf cacao @@ -89,13 +79,12 @@ 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 $(GCJWEBPLUGIN_CLEAN) \ - $(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \ - clean-jtreg clean-jtreg-reports + clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \ + hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports EXTRA_DIST = rt generated \ patches/* \ - gcjwebplugin.cc tools-copy contrib ports \ + tools-copy contrib ports \ extra overlays \ javaws.png javaws.desktop visualvm.desktop \ jconsole.desktop policytool.desktop \ @@ -1119,7 +1108,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \ + $(ICEDTEAPLUGIN_TARGET) \ extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \ stamps/pulse-java.stamp $(ARCH_PREFIX) $(MAKE) \ @@ -1130,18 +1119,11 @@ mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_GCJWEBPLUGIN - cp -pPRf gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -else if ENABLE_PLUGIN cp -pPRf IcedTeaPlugin.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -pPRf IcedTeaPlugin.so \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif endif if ENABLE_PULSE_JAVA cp -pPRf libpulse-java.so \ @@ -1204,7 +1186,7 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \ + $(ICEDTEAPLUGIN_TARGET) \ extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \ stamps/pulse-java.stamp $(ARCH_PREFIX) $(MAKE) \ @@ -1215,18 +1197,11 @@ mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext -if ENABLE_GCJWEBPLUGIN - cp -pPRf gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) -else if ENABLE_PLUGIN cp -pPRf IcedTeaPlugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -pPRf IcedTeaPlugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif endif if ENABLE_PULSE_JAVA cp -pPRf libpulse-java.so \ @@ -1624,24 +1599,6 @@ rm -rf cacao rm -f stamps/cacao.stamp -if ENABLE_GCJWEBPLUGIN -# gcjwebplugin.so. -gcjwebplugin.so: gcjwebplugin.cc - if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \ - revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \ - fi ; \ - if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \ - plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \ - $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \ - $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \ - $(GTK_CFLAGS) $(GTK_LIBS) \ - -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ - -DPLUGIN_VERSION="\"$$plugin_version\"" \ - -fPIC -shared -o $@ $< - -clean-gcjwebplugin: - rm -f gcjwebplugin.so -else if ENABLE_PLUGIN # IcedTeaPlugin.so. # Separate compile and link invocations to ensure intermediate object @@ -1671,8 +1628,6 @@ rm -f IcedTeaPlugin.o rm -f IcedTeaPlugin.so endif -endif - # PulseAudio based mixer # (pulse-java) diff -r 19e655aeb5fb configure.ac --- a/configure.ac Tue May 05 17:04:37 2009 -0400 +++ b/configure.ac Tue May 05 17:05:49 2009 -0400 @@ -127,21 +127,13 @@ AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes") AC_MSG_RESULT(${enable_visualvm}) -AC_MSG_CHECKING([whether to build the LiveConnect plugin]) -AC_ARG_ENABLE([liveconnect], - [AS_HELP_STRING([--disable-liveconnect], +AC_MSG_CHECKING([whether to build the browser plugin]) +AC_ARG_ENABLE([plugin], + [AS_HELP_STRING([--disable-plugin], [Disable compilation of browser plugin])], [enable_plugin="${enableval}"], [enable_plugin="yes"]) AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes") AC_MSG_RESULT(${enable_plugin}) - -AC_MSG_CHECKING([whether to build gcjwebplugin]) -AC_ARG_ENABLE([gcjwebplugin], - [AS_HELP_STRING([--enable-gcjwebplugin], - [Build the GCJ Web Plugin plugin (deprecated)])], - [enable_gcjwebplugin="${enableval}"], [enable_gcjwebplugin="no"]) -AM_CONDITIONAL(ENABLE_GCJWEBPLUGIN, test "x${enable_gcjwebplugin}" = "xyes") -AC_MSG_RESULT(${enable_gcjwebplugin}) AC_MSG_CHECKING([whether to include PulseAudio support]) AC_ARG_ENABLE([pulse-java], @@ -452,47 +444,12 @@ dnl Check for plugin support headers and libraries. dnl FIXME: use unstable -if test "x${enable_gcjwebplugin}" = "xyes" -then - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, iceape-plugin iceape-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - AC_MSG_ERROR([Could not find plugin support headers and libraries.]) - fi - +if test "x${enable_plugin}" = "xyes" + then + PKG_CHECK_MODULES(XULRUNNER, \ + nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9) + PKG_CHECK_MODULES(GTK, gtk+-2.0) PKG_CHECK_MODULES(GLIB, glib-2.0) - PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0 gdk-pixbuf-2.0) AC_SUBST(MOZILLA_CFLAGS) AC_SUBST(MOZILLA_LIBS) @@ -500,14 +457,7 @@ AC_SUBST(GLIB_LIBS) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -else - if test "x${enable_plugin}" = "xyes" - then - PKG_CHECK_MODULES(XULRUNNER, \ - nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9) - PKG_CHECK_MODULES(GTK, gtk+-2.0) fi -fi AC_LANG_PUSH([C++]) OLDCPPFLAGS="$CPPFLAGS" From dbhole at redhat.com Tue May 5 14:11:43 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 5 May 2009 17:11:43 -0400 Subject: Patch for Bug #331 (compiling with xulrunner 1.9.1) In-Reply-To: <4A007C5A.3080008@redhat.com> References: <20090505142947.GA3517@redhat.com> <4A007C5A.3080008@redhat.com> Message-ID: <20090505211143.GB23367@redhat.com> * Andrew Haley [2009-05-05 13:50]: > Deepak Bhole wrote: > > Attached patch adds conditional compilation for the plugin, so that > > it can compile with xulrunner 1.9.1 and older versions. I have tested > > the patch on an F10 box (xul 1.9.10) and rawhide (xul 1.9.1). > > > > Bug is here: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=331 > > > > ChangeLog: > > 2009-05-05 Deepak Bhole > > > > * IcedTeaPlugin.cc: Add conditional compilation block. > > * Makefile.am: Define a collapsed (comparable) version when compiling the > > plugin. > > * configure.ac: Determine a collapsed (comparable) version that can be > > used by the preprocessor for conditional compilation. > > I agree. That looks like the best way to fix it. > Thanks! Committed. Cheers, Deepak From martinrb at google.com Tue May 5 14:10:34 2009 From: martinrb at google.com (Martin Buchholz) Date: Tue, 5 May 2009 14:10:34 -0700 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <4A007834.1090502@sun.com> References: <20090212150029.GA1121@rivendell.middle-earth.co.uk> <1234774554.11228.3.camel@localhost.localdomain> <1234862105.4062.8.camel@fedora.wildebeest.org> <499B727D.6060901@sun.com> <17c6771e0903200428j75e26899x9c15daf57f5ed20e@mail.gmail.com> <49E3ABEA.6020400@sun.com> <1241001697.4267.1.camel@fedora.wildebeest.org> <49F9F971.1010404@sun.com> <17c6771e0905050851u70e44df4oba96c6c7d3e1363b@mail.gmail.com> <4A007834.1090502@sun.com> Message-ID: <1ccfd1c10905051410h255d7ecbt386b8e87340646d9@mail.gmail.com> On Tue, May 5, 2009 at 10:32, Dalibor Topic wrote: > Andrew John Hughes wrote: >> Any idea when these repositories will appear? > > We'll need a "HotSpot Express" project proposal first. I don't see why we need a "project". There's already all kinds of hotspot forests on http://hg.openjdk.java.net/ that don't have any associated formal project. I suggest that the current maintainer of the openjdk public forests (Erik, perhaps) just go ahead and create the new repos with whatever name you want (e.g. "hotspot-14"). Martin From langel at redhat.com Tue May 5 14:24:22 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 05 May 2009 17:24:22 -0400 Subject: Patch to remove GCJ Web Plugin support In-Reply-To: <20090505211034.GA23367@redhat.com> References: <20090505211034.GA23367@redhat.com> Message-ID: <4A00AE86.1090800@redhat.com> Deepak Bhole wrote: > Per the goals for 1.5, here is a patch that removes gcj web plugin > support. > > ChangeLog: > 2009-05-05 Deepak Bhole > > * Makefile.am: Remove GCJ Web Plugin support. > * configure.ac: Ditto. I looked through the patch and it is fine to commit. As long as it doesn't break the build, go ahead and commit. Cheers, Lillian From dbhole at redhat.com Tue May 5 14:32:56 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 5 May 2009 17:32:56 -0400 Subject: Patch to remove GCJ Web Plugin support In-Reply-To: <4A00AE86.1090800@redhat.com> References: <20090505211034.GA23367@redhat.com> <4A00AE86.1090800@redhat.com> Message-ID: <20090505213256.GB28523@redhat.com> * Lillian Angel [2009-05-05 17:24]: > Deepak Bhole wrote: >> Per the goals for 1.5, here is a patch that removes gcj web plugin >> support. >> >> ChangeLog: >> 2009-05-05 Deepak Bhole >> >> * Makefile.am: Remove GCJ Web Plugin support. >> * configure.ac: Ditto. > > I looked through the patch and it is fine to commit. As long as it > doesn't break the build, go ahead and commit. > Thanks! I tested it by trying build with and without plugin, and both had expected results. Patch committed. Cheers, Deepak From gnu_andrew at member.fsf.org Tue May 5 14:46:00 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 5 May 2009 22:46:00 +0100 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <1ccfd1c10905051410h255d7ecbt386b8e87340646d9@mail.gmail.com> References: <20090212150029.GA1121@rivendell.middle-earth.co.uk> <1234862105.4062.8.camel@fedora.wildebeest.org> <499B727D.6060901@sun.com> <17c6771e0903200428j75e26899x9c15daf57f5ed20e@mail.gmail.com> <49E3ABEA.6020400@sun.com> <1241001697.4267.1.camel@fedora.wildebeest.org> <49F9F971.1010404@sun.com> <17c6771e0905050851u70e44df4oba96c6c7d3e1363b@mail.gmail.com> <4A007834.1090502@sun.com> <1ccfd1c10905051410h255d7ecbt386b8e87340646d9@mail.gmail.com> Message-ID: <17c6771e0905051446i35c9192bi33eb18d76e3b6e35@mail.gmail.com> 2009/5/5 Martin Buchholz : > On Tue, May 5, 2009 at 10:32, Dalibor Topic wrote: >> Andrew John Hughes wrote: >>> Any idea when these repositories will appear? >> >> We'll need a "HotSpot Express" project proposal first. > > I don't see why we need a "project". > There's already all kinds of hotspot forests on > http://hg.openjdk.java.net/ > that don't have any associated formal project. > > I suggest that the current maintainer of > the openjdk public forests (Erik, perhaps) > just go ahead and create the new repos > with whatever name you want > (e.g. "hotspot-14"). > > Martin > It does seem like a bit too much bureaucracy. We've already been waiting three months for this. -- 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 Tue May 5 14:51:26 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 5 May 2009 22:51:26 +0100 Subject: Patch to remove GCJ Web Plugin support In-Reply-To: <20090505213256.GB28523@redhat.com> References: <20090505211034.GA23367@redhat.com> <4A00AE86.1090800@redhat.com> <20090505213256.GB28523@redhat.com> Message-ID: <17c6771e0905051451i5928fcfdl737882443dea6928@mail.gmail.com> 2009/5/5 Deepak Bhole : > * Lillian Angel [2009-05-05 17:24]: >> Deepak Bhole wrote: >>> Per the goals for 1.5, here is a patch that removes gcj web plugin >>> support. >>> >>> ChangeLog: >>> 2009-05-05 ?Deepak Bhole >>> >>> ? ? * Makefile.am: Remove GCJ Web Plugin support. >>> ? ? * configure.ac: Ditto. >> >> I looked through the patch and it is fine to commit. As long as it >> doesn't break the build, go ahead and commit. >> > > Thanks! I tested it by trying build with and without plugin, and both > had expected results. Patch committed. > > Cheers, > Deepak > Yeah looks the same as what I did with 7. Now you can finally close http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=236 :) -- 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 mark at klomp.org Wed May 6 00:36:13 2009 From: mark at klomp.org (Mark Wielaard) Date: Wed, 06 May 2009 09:36:13 +0200 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <17c6771e0905051446i35c9192bi33eb18d76e3b6e35@mail.gmail.com> References: <20090212150029.GA1121@rivendell.middle-earth.co.uk> <1234862105.4062.8.camel@fedora.wildebeest.org> <499B727D.6060901@sun.com> <17c6771e0903200428j75e26899x9c15daf57f5ed20e@mail.gmail.com> <49E3ABEA.6020400@sun.com> <1241001697.4267.1.camel@fedora.wildebeest.org> <49F9F971.1010404@sun.com> <17c6771e0905050851u70e44df4oba96c6c7d3e1363b@mail.gmail.com> <4A007834.1090502@sun.com> <1ccfd1c10905051410h255d7ecbt386b8e87340646d9@mail.gmail.com> <17c6771e0905051446i35c9192bi33eb18d76e3b6e35@mail.gmail.com> Message-ID: <1241595373.2374.7.camel@fedora.wildebeest.org> Hi, On Tue, 2009-05-05 at 22:46 +0100, Andrew John Hughes wrote: > 2009/5/5 Martin Buchholz : > > On Tue, May 5, 2009 at 10:32, Dalibor Topic wrote: > >> Andrew John Hughes wrote: > >>> Any idea when these repositories will appear? > >> > >> We'll need a "HotSpot Express" project proposal first. > > > > I don't see why we need a "project". > > There's already all kinds of hotspot forests on > > http://hg.openjdk.java.net/ > > that don't have any associated formal project. > > > > I suggest that the current maintainer of > > the openjdk public forests (Erik, perhaps) > > just go ahead and create the new repos > > with whatever name you want > > (e.g. "hotspot-14"). > > It does seem like a bit too much bureaucracy. We've already been > waiting three months for this. I agree that going through the whole formal project proposal, voting, etc. seems a bit heavy-weight for something like this. hotspot already has 5 repos. This will just be a stabilization branch. In IcedTea we let everybody make release branches whenever they want to stabilize things (under /hg/release/), or create personal branches (under /people//) whenever they want to do some experimentation. That makes it so that all stabilization or experimentation is easy to do in public and share with everybody. Cheers, Mark From gbenson at redhat.com Wed May 6 02:21:39 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 6 May 2009 10:21:39 +0100 Subject: Zero and Shark patch refactoring In-Reply-To: <20090505132324.GB3488@redhat.com> References: <20090505132324.GB3488@redhat.com> Message-ID: <20090506092139.GA3247@redhat.com> Gary Benson wrote: > Also, to make this easier I'd like to get rid of the stuff for > building Zero using the bundled HotSpot. Is anybody still using > Zero like that? Apparently nobody is, as it doesn't build ;) Cheers, Gary -- http://gbenson.net/ From gnu_andrew at member.fsf.org Wed May 6 08:01:34 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 6 May 2009 16:01:34 +0100 Subject: Zero and Shark patch refactoring In-Reply-To: <20090506092139.GA3247@redhat.com> References: <20090505132324.GB3488@redhat.com> <20090506092139.GA3247@redhat.com> Message-ID: <17c6771e0905060801n662106adh71768a53bf086b38@mail.gmail.com> 2009/5/6 Gary Benson : > Gary Benson wrote: >> Also, to make this easier I'd like to get rid of the stuff for >> building Zero using the bundled HotSpot. ?Is anybody still using >> Zero like that? > > Apparently nobody is, as it doesn't build ;) > > Cheers, > Gary > > -- > http://gbenson.net/ > Doesn't surprise me ;) I thought we'd removed support for original builds anyway... -- 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 mr at sun.com Wed May 6 08:09:28 2009 From: mr at sun.com (Mark Reinhold) Date: Wed, 06 May 2009 08:09:28 -0700 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: mark@klomp.org; Wed, 06 May 2009 09:36:13 +0200; <1241595373.2374.7.camel@fedora.wildebeest.org> Message-ID: <20090506150928.5999A5591@eggemoggin.niobe.net> Thanks for all the feedback. In order to move this forward, I'll go ahead and create the proposed forests on hg.openjdk.java.net. In the fullness of time I still think there's value in having a HotSpot Express Project. Those of us who've been involved in this discussion will understand what's going on, but it'd be good to have an obvious place where people new to the topic can find documentation. - Mark From bugzilla-daemon at icedtea.classpath.org Wed May 6 10:09:25 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 May 2009 17:09:25 +0000 Subject: [Bug 291] scaron html entity not rendered properly Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=291 omajid at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|omajid at redhat.com |.org | Status|NEW |ASSIGNED ------- Comment #3 from omajid at redhat.com 2009-05-06 17:09 ------- Created an attachment (id=209) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=209&action=view) Patch to fix html entity generation Tracked upstream as http://bugs.openjdk.java.net/show_bug.cgi?id=100049 -- 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. You are the assignee for the bug, or are watching the assignee. From langel at redhat.com Wed May 6 10:44:32 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 06 May 2009 13:44:32 -0400 Subject: [RFC]: Patch for bug #498108 Message-ID: <4A01CC80.3060300@redhat.com> Hi, Attached is a patch to fix https://bugzilla.redhat.com/show_bug.cgi?id=498108. We need to remove the setPolicy restriction for trusted webstart applications, since each run in their own vm instance. Though the same code is used for plugins, and this restriction should still be upheld. I have added a parameter to JNLPRuntime.initialize to determine if a webstart application or a plugin applet are being initialized. 2009-05-06 Lillian Angel Fixes bz#498108 * rt/net/sourceforge/jnlp/NetxPanel.java (runLoader): Pass false to JNLPRuntime.initialize, since this is an applet. * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (PluginAppletSecurityContext): Likewise. * rt/net/sourceforge/jnlp/runtime/Boot.java (run): Pass true to JNLPRuntime.initialize, since this is a webstart app. * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize): Added new parameter isApplication, which is used to set global static variable isWebstartApplication. (isWebstartApplication): New accessor function. * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: (checkPermission): Added call to JNLPRuntime.isWebstartApplication so check is bypassed if the permissions are to be checked for a webstart application. Thanks, Lillian -------------- next part -------------- A non-text attachment was scrubbed... Name: 498108.patch Type: text/x-diff Size: 4156 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090506/781aef4c/498108.patch From dbhole at redhat.com Wed May 6 11:07:53 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 6 May 2009 14:07:53 -0400 Subject: [RFC]: Patch for bug #498108 In-Reply-To: <4A01CC80.3060300@redhat.com> References: <4A01CC80.3060300@redhat.com> Message-ID: <20090506180753.GB22721@redhat.com> * Lillian Angel [2009-05-06 13:45]: > Hi, > > Attached is a patch to fix > https://bugzilla.redhat.com/show_bug.cgi?id=498108. > > We need to remove the setPolicy restriction for trusted webstart > applications, since each run in their own vm instance. Though the same > code is used for plugins, and this restriction should still be upheld. I > have added a parameter to JNLPRuntime.initialize to determine if a > webstart application or a plugin applet are being initialized. > > > 2009-05-06 Lillian Angel > > Fixes bz#498108 > * rt/net/sourceforge/jnlp/NetxPanel.java > (runLoader): Pass false to JNLPRuntime.initialize, since this is an > applet. > * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java > (PluginAppletSecurityContext): Likewise. > * rt/net/sourceforge/jnlp/runtime/Boot.java > (run): Pass true to JNLPRuntime.initialize, since this is a webstart > app. > * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java > (initialize): Added new parameter isApplication, which is used to set > global static variable isWebstartApplication. > (isWebstartApplication): New accessor function. > * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: > (checkPermission): Added call to JNLPRuntime.isWebstartApplication so > check is bypassed if the permissions are to be checked for a webstart > application. > Looks good to me! Assuming you have tested it, please go ahead and commit. Cheers, Deepak > > Thanks, > Lillian > > From langel at redhat.com Wed May 6 11:08:44 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 06 May 2009 18:08:44 +0000 Subject: changeset in /hg/icedtea6: 2009-05-06 Lillian Angel changeset 538d1a817e21 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=538d1a817e21 description: 2009-05-06 Lillian Angel Fixes bz#498108 * rt/net/sourceforge/jnlp/NetxPanel.java (runLoader): Pass false to JNLPRuntime.initialize, since this is an applet. * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (PluginAppletSecurityContext): Likewise. * rt/net/sourceforge/jnlp/runtime/Boot.java (run): Pass true to JNLPRuntime.initialize, since this is a webstart app. * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize): Added new parameter isApplication, which is used to set global static variable isWebstartApplication. (isWebstartApplication): New accessor function. * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: (checkPermission): Added call to JNLPRuntime.isWebstartApplication so the check is bypassed if the permissions are to be checked for a webstart application. diffstat: 6 files changed, 43 insertions(+), 7 deletions(-) ChangeLog | 20 ++++++++++++ plugin/icedtea/sun/applet/PluginAppletSecurityContext.java | 2 - rt/net/sourceforge/jnlp/NetxPanel.java | 2 - rt/net/sourceforge/jnlp/runtime/Boot.java | 2 - rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 17 +++++++++- rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 7 ++-- diffs (128 lines): diff -r 19e655aeb5fb -r 538d1a817e21 ChangeLog --- a/ChangeLog Tue May 05 17:04:37 2009 -0400 +++ b/ChangeLog Wed May 06 14:09:31 2009 -0400 @@ -1,3 +1,23 @@ 2009-05-05 Deepak Bhole + + Fixes bz#498108 + * rt/net/sourceforge/jnlp/NetxPanel.java + (runLoader): Pass false to JNLPRuntime.initialize, since this is an + applet. + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (PluginAppletSecurityContext): Likewise. + * rt/net/sourceforge/jnlp/runtime/Boot.java + (run): Pass true to JNLPRuntime.initialize, since this + is a webstart app. + * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java + (initialize): Added new parameter isApplication, which is used to set + global static variable isWebstartApplication. + (isWebstartApplication): New accessor function. + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: + (checkPermission): Added call to JNLPRuntime.isWebstartApplication so + the check is bypassed if the permissions are to be checked for + a webstart application. + 2009-05-05 Deepak Bhole * IcedTeaPlugin.cc: Add conditional compilation block. diff -r 19e655aeb5fb -r 538d1a817e21 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java --- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java Tue May 05 17:04:37 2009 -0400 +++ b/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java Wed May 06 14:09:31 2009 -0400 @@ -248,7 +248,7 @@ public class PluginAppletSecurityContext // an applet will be loaded at some point, we should make it the SM // that JNLPRuntime will try to install if (System.getSecurityManager() == null) { - JNLPRuntime.initialize(); + JNLPRuntime.initialize(false); } JNLPRuntime.disableExit(); diff -r 19e655aeb5fb -r 538d1a817e21 rt/net/sourceforge/jnlp/NetxPanel.java --- a/rt/net/sourceforge/jnlp/NetxPanel.java Tue May 05 17:04:37 2009 -0400 +++ b/rt/net/sourceforge/jnlp/NetxPanel.java Wed May 06 14:09:31 2009 -0400 @@ -78,7 +78,7 @@ public class NetxPanel extends AppletVie if (JNLPRuntime.isDebug()) System.out.println("initializing JNLPRuntime..."); - JNLPRuntime.initialize(); + JNLPRuntime.initialize(false); } else { if (JNLPRuntime.isDebug()) System.out.println("JNLPRuntime already initialized"); diff -r 19e655aeb5fb -r 538d1a817e21 rt/net/sourceforge/jnlp/runtime/Boot.java --- a/rt/net/sourceforge/jnlp/runtime/Boot.java Tue May 05 17:04:37 2009 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/Boot.java Wed May 06 14:09:31 2009 -0400 @@ -197,7 +197,7 @@ public final class Boot implements Privi public Object run() { JNLPRuntime.setBaseDir(getBaseDir()); JNLPRuntime.setSecurityEnabled(null == getOption("-nosecurity")); - JNLPRuntime.initialize(); + JNLPRuntime.initialize(true); try { new Launcher().launch(getFile()); diff -r 19e655aeb5fb -r 538d1a817e21 rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue May 05 17:04:37 2009 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed May 06 14:09:31 2009 -0400 @@ -94,6 +94,9 @@ public class JNLPRuntime { /** mutex to wait on, for initialization */ public static Object initMutex = new Object(); + /** set to true if this is a webstart application. */ + private static boolean isWebstartApplication; + /** * Returns whether the JNLP runtime environment has been * initialized. Once initialized, some properties such as the @@ -112,10 +115,14 @@ public class JNLPRuntime { * initialized, methods that alter the runtime can only be * called by the exit class.

* + * @param isApplication is true if a webstart application is being initialized + * * @throws IllegalStateException if the runtime was previously initialized */ - public static void initialize() throws IllegalStateException { + public static void initialize(boolean isApplication) throws IllegalStateException { checkInitialized(); + + isWebstartApplication = isApplication; if (headless == false) checkHeadless(); @@ -146,6 +153,14 @@ public class JNLPRuntime { } initialized = true; + } + + /** + * Returns true if a webstart application has been initialized, and false + * for a plugin applet. + */ + public static boolean isWebstartApplication() { + return isWebstartApplication; } /** diff -r 19e655aeb5fb -r 538d1a817e21 rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Tue May 05 17:04:37 2009 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed May 06 14:09:31 2009 -0400 @@ -255,13 +255,14 @@ class JNLPSecurityManager extends Securi */ public void checkPermission(Permission perm) { String name = perm.getName(); - + // Enable this manually -- it'll produce too much output for -verbose // otherwise. // if (true) // System.out.println("Checking permission: " + perm.toString()); - if ("setPolicy".equals(name) || - "setSecurityManager".equals(name)) + + if (!JNLPRuntime.isWebstartApplication() && ("setPolicy".equals(name) || + "setSecurityManager".equals(name))) throw new SecurityException(R("RCantReplaceSM")); try { From dbhole at redhat.com Wed May 6 13:07:32 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 06 May 2009 20:07:32 +0000 Subject: changeset in /hg/icedtea6: * Makefile.am: Remove GCJ Web Plugin ... Message-ID: changeset c5c31d555ae3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c5c31d555ae3 description: * Makefile.am: Remove GCJ Web Plugin support. * configure.ac: Ditto. diffstat: 3 files changed, 20 insertions(+), 110 deletions(-) ChangeLog | 5 ++++ Makefile.am | 57 +++++------------------------------------------- configure.ac | 68 +++++++--------------------------------------------------- diffs (253 lines): diff -r 538d1a817e21 -r c5c31d555ae3 ChangeLog --- a/ChangeLog Wed May 06 14:09:31 2009 -0400 +++ b/ChangeLog Wed May 06 16:10:04 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-06 Lillian Angel + + * Makefile.am: Remove GCJ Web Plugin support. + * configure.ac: Ditto. + 2009-05-06 Lillian Angel Fixes bz#498108 diff -r 538d1a817e21 -r c5c31d555ae3 Makefile.am --- a/Makefile.am Wed May 06 14:09:31 2009 -0400 +++ b/Makefile.am Wed May 06 16:10:04 2009 -0400 @@ -8,12 +8,6 @@ NETBEANS_PROFILER_MD5SUM = a6756a62291eb NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380 VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe -if ENABLE_GCJWEBPLUGIN -GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin -GCJWEBPLUGIN_TARGET = gcjwebplugin.so -else -GCJWEBPLUGIN_CLEAN = -GCJWEBPLUGIN_TARGET = if ENABLE_PLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so @@ -22,9 +16,8 @@ else else ICEDTEAPLUGIN_CLEAN = ICEDTEAPLUGIN_TARGET = -PLUGIN_PATCH = patches/icedtea-plugin.patch +PLUGIN_PATCH = LIVECONNECT_DIR = -endif endif if ENABLE_PULSE_JAVA @@ -68,9 +61,6 @@ if ENABLE_PLUGIN if ENABLE_PLUGIN rm -f IcedTeaPlugin.o IcedTeaPlugin.so else -if ENABLE_GCJWEBPLUGIN - rm -f gcjwebplugin.so -endif endif if BUILD_CACAO rm -rf cacao @@ -89,13 +79,12 @@ install: 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 $(GCJWEBPLUGIN_CLEAN) \ - $(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \ - clean-jtreg clean-jtreg-reports + clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \ + hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports EXTRA_DIST = rt generated \ patches/* \ - gcjwebplugin.cc tools-copy contrib ports \ + tools-copy contrib ports \ extra overlays \ javaws.png javaws.desktop visualvm.desktop \ jconsole.desktop policytool.desktop \ @@ -1119,7 +1108,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \ + $(ICEDTEAPLUGIN_TARGET) \ extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \ stamps/pulse-java.stamp $(ARCH_PREFIX) $(MAKE) \ @@ -1130,18 +1119,11 @@ stamps/icedtea.stamp: stamps/bootstrap-d mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_GCJWEBPLUGIN - cp -pPRf gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -else if ENABLE_PLUGIN cp -pPRf IcedTeaPlugin.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -pPRf IcedTeaPlugin.so \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif endif if ENABLE_PULSE_JAVA cp -pPRf libpulse-java.so \ @@ -1204,7 +1186,7 @@ stamps/icedtea-debug.stamp: stamps/boots stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \ + $(ICEDTEAPLUGIN_TARGET) \ extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \ stamps/pulse-java.stamp $(ARCH_PREFIX) $(MAKE) \ @@ -1215,18 +1197,11 @@ stamps/icedtea-debug.stamp: stamps/boots mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext -if ENABLE_GCJWEBPLUGIN - cp -pPRf gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) -else if ENABLE_PLUGIN cp -pPRf IcedTeaPlugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -pPRf IcedTeaPlugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif endif if ENABLE_PULSE_JAVA cp -pPRf libpulse-java.so \ @@ -1624,24 +1599,6 @@ clean-cacao: rm -rf cacao rm -f stamps/cacao.stamp -if ENABLE_GCJWEBPLUGIN -# gcjwebplugin.so. -gcjwebplugin.so: gcjwebplugin.cc - if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \ - revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \ - fi ; \ - if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \ - plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \ - $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \ - $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \ - $(GTK_CFLAGS) $(GTK_LIBS) \ - -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ - -DPLUGIN_VERSION="\"$$plugin_version\"" \ - -fPIC -shared -o $@ $< - -clean-gcjwebplugin: - rm -f gcjwebplugin.so -else if ENABLE_PLUGIN # IcedTeaPlugin.so. # Separate compile and link invocations to ensure intermediate object @@ -1671,8 +1628,6 @@ clean-IcedTeaPlugin: rm -f IcedTeaPlugin.o rm -f IcedTeaPlugin.so endif -endif - # PulseAudio based mixer # (pulse-java) diff -r 538d1a817e21 -r c5c31d555ae3 configure.ac --- a/configure.ac Wed May 06 14:09:31 2009 -0400 +++ b/configure.ac Wed May 06 16:10:04 2009 -0400 @@ -127,21 +127,13 @@ AM_CONDITIONAL(WITH_VISUALVM, test "x${e AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes") AC_MSG_RESULT(${enable_visualvm}) -AC_MSG_CHECKING([whether to build the LiveConnect plugin]) -AC_ARG_ENABLE([liveconnect], - [AS_HELP_STRING([--disable-liveconnect], +AC_MSG_CHECKING([whether to build the browser plugin]) +AC_ARG_ENABLE([plugin], + [AS_HELP_STRING([--disable-plugin], [Disable compilation of browser plugin])], [enable_plugin="${enableval}"], [enable_plugin="yes"]) AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes") AC_MSG_RESULT(${enable_plugin}) - -AC_MSG_CHECKING([whether to build gcjwebplugin]) -AC_ARG_ENABLE([gcjwebplugin], - [AS_HELP_STRING([--enable-gcjwebplugin], - [Build the GCJ Web Plugin plugin (deprecated)])], - [enable_gcjwebplugin="${enableval}"], [enable_gcjwebplugin="no"]) -AM_CONDITIONAL(ENABLE_GCJWEBPLUGIN, test "x${enable_gcjwebplugin}" = "xyes") -AC_MSG_RESULT(${enable_gcjwebplugin}) AC_MSG_CHECKING([whether to include PulseAudio support]) AC_ARG_ENABLE([pulse-java], @@ -452,47 +444,12 @@ fi dnl Check for plugin support headers and libraries. dnl FIXME: use unstable -if test "x${enable_gcjwebplugin}" = "xyes" -then - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, iceape-plugin iceape-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - AC_MSG_ERROR([Could not find plugin support headers and libraries.]) - fi - +if test "x${enable_plugin}" = "xyes" + then + PKG_CHECK_MODULES(XULRUNNER, \ + nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9) + PKG_CHECK_MODULES(GTK, gtk+-2.0) PKG_CHECK_MODULES(GLIB, glib-2.0) - PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0 gdk-pixbuf-2.0) AC_SUBST(MOZILLA_CFLAGS) AC_SUBST(MOZILLA_LIBS) @@ -500,14 +457,7 @@ then AC_SUBST(GLIB_LIBS) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -else - if test "x${enable_plugin}" = "xyes" - then - PKG_CHECK_MODULES(XULRUNNER, \ - nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9) - PKG_CHECK_MODULES(GTK, gtk+-2.0) - fi -fi + fi AC_LANG_PUSH([C++]) OLDCPPFLAGS="$CPPFLAGS" From aph at redhat.com Thu May 7 02:37:12 2009 From: aph at redhat.com (Andrew Haley) Date: Thu, 07 May 2009 10:37:12 +0100 Subject: [RFC]: Patch for bug #498108 In-Reply-To: <4A01CC80.3060300@redhat.com> References: <4A01CC80.3060300@redhat.com> Message-ID: <4A02ABC8.7030209@redhat.com> Lillian Angel wrote: > Attached is a patch to fix > https://bugzilla.redhat.com/show_bug.cgi?id=498108. > > We need to remove the setPolicy restriction for trusted webstart > applications, since each run in their own vm instance. Though the same > code is used for plugins, and this restriction should still be upheld. I > have added a parameter to JNLPRuntime.initialize to determine if a > webstart application or a plugin applet are being initialized. Two minor style nits: > diff -r a5006e51afe4 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java > --- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java Tue May 05 14:42:36 2009 -0400 > +++ b/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java Wed May 06 13:39:27 2009 -0400 > @@ -248,7 +248,7 @@ > // an applet will be loaded at some point, we should make it the SM > // that JNLPRuntime will try to install > if (System.getSecurityManager() == null) { > - JNLPRuntime.initialize(); > + JNLPRuntime.initialize(false); > is much easier to read as something like: JNLPRuntime.initialize(/* isApplication */ false); > diff -r a5006e51afe4 rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java > --- a/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Tue May 05 14:42:36 2009 -0400 > +++ b/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed May 06 13:39:27 2009 -0400 > @@ -255,13 +255,14 @@ > */ > public void checkPermission(Permission perm) { > String name = perm.getName(); > - > + > // Enable this manually -- it'll produce too much output for -verbose > // otherwise. > // if (true) > // System.out.println("Checking permission: " + perm.toString()); > - if ("setPolicy".equals(name) || > - "setSecurityManager".equals(name)) > + > + if (!JNLPRuntime.isWebstartApplication() && ("setPolicy".equals(name) || > + "setSecurityManager".equals(name))) > throw new SecurityException(R("RCantReplaceSM")); would be better as if (!JNLPRuntime.isWebstartApplication() && ("setPolicy".equals(name) || "setSecurityManager".equals(name))) throw new SecurityException(R("RCantReplaceSM")); I misunderstood this the first couple of times I read it. Andrew. From gbenson at redhat.com Thu May 7 05:34:16 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 7 May 2009 13:34:16 +0100 Subject: Zero and Shark patch refactoring In-Reply-To: <17c6771e0905060801n662106adh71768a53bf086b38@mail.gmail.com> References: <20090505132324.GB3488@redhat.com> <20090506092139.GA3247@redhat.com> <17c6771e0905060801n662106adh71768a53bf086b38@mail.gmail.com> Message-ID: <20090507123415.GA3181@redhat.com> Andrew John Hughes wrote: > 2009/5/6 Gary Benson : > > Gary Benson wrote: > > > Also, to make this easier I'd like to get rid of the stuff for > > > building Zero using the bundled HotSpot. ?Is anybody still using > > > Zero like that? > > > > Apparently nobody is, as it doesn't build ;) > > Doesn't surprise me ;) > I thought we'd removed support for original builds anyway... I thought we did too, but the code is still there in the makefiles, along with a bunch of patches required for it. Cheers, Gary -- http://gbenson.net/ From doko at ubuntu.com Thu May 7 06:10:50 2009 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 07 May 2009 15:10:50 +0200 Subject: Zero and Shark patch refactoring In-Reply-To: <20090507123415.GA3181@redhat.com> References: <20090505132324.GB3488@redhat.com> <20090506092139.GA3247@redhat.com> <17c6771e0905060801n662106adh71768a53bf086b38@mail.gmail.com> <20090507123415.GA3181@redhat.com> Message-ID: <4A02DDDA.5000804@ubuntu.com> Gary Benson schrieb: > Andrew John Hughes wrote: >> 2009/5/6 Gary Benson : >>> Gary Benson wrote: >>>> Also, to make this easier I'd like to get rid of the stuff for >>>> building Zero using the bundled HotSpot. Is anybody still using >>>> Zero like that? >>> Apparently nobody is, as it doesn't build ;) >> Doesn't surprise me ;) >> I thought we'd removed support for original builds anyway... > > I thought we did too, but the code is still there in the makefiles, > along with a bunch of patches required for it. it does/should work with the 1.4 release. I didn't check after the release, and I don't use it anymore. Matthias From gbenson at redhat.com Thu May 7 05:41:48 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 7 May 2009 13:41:48 +0100 Subject: [PATCH] Remove support for building Zero with bundled HotSpot Message-ID: <20090507124147.GB3181@redhat.com> Hi all, Once upon a time, IcedTea used the HotSpot supplied in the OpenJDK 6 tarball. This didn't contain the C++ interpreter, so for Zero and Shark a patch was created to upgrade the HotSpot to a (somewhat arbitrary) newer version that did. Nowadays, IcedTea uses an upgraded HotSpot by default, one that contains the C++ interpreter. This patch removes support for building Zero and Shark with the original HotSpot, an option that has not worked for some months. Ok to commit? Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r c5c31d555ae3 HACKING --- a/HACKING Wed May 06 16:10:04 2009 -0400 +++ b/HACKING Thu May 07 13:32:50 2009 +0100 @@ -125,18 +125,9 @@ The following patches are only applied for IcedTea builds using the zero-assembler: * icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. -* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485). * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. -* icedtea-hotspot-6b12-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only). - - Never edit this patch. It should be regenerated by unzipping the - openjdk6 build you're using into openjdk6, and the openjdk7 build - you want to use into openjdk, then running: - diff -ruNb openjdk{6,}/hotspot/src/share > icedtea-hotspot-6bXX-7bYY.patch - diff -ruNb openjdk{6,}/hotspot/src/os/linux >> icedtea-hotspot-6bXX-7bYY.patch -* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef. * icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. * icedtea-signature-iterator.patch: Add zero-specific signature handling. -* icedtea-signed-types.patch: Make use of unsigned/signed types explicit. * 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. @@ -175,3 +166,9 @@ * icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13. * openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28. * icedtea-cc-interp-no-fer.patch: Replaced with icedtea-cc-interp-jvmti.patch, of which it is a subset. +* icedtea-hotspot-6b14-7b24.patch: Upgrade HotSpot to a version with the C++ interpreter; not required with HS14. +* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef; not required with HS14. +* icedtea-signed-types.patch: Make use of unsigned/signed types explicit; not required with HS14. +* icedtea-hotspot-citypeflow.patch: Not required with HS14. +* icedtea-core-zero-build.patch: Not required with HS14. +* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14. diff -r c5c31d555ae3 Makefile.am --- a/Makefile.am Wed May 06 16:10:04 2009 -0400 +++ b/Makefile.am Thu May 07 13:32:50 2009 +0100 @@ -459,16 +459,8 @@ patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch endif -# If ZERO_BUILD is set then we are building zero and need -# to patch up to OpenJDK 7 HotSpot for the C++ interpreter. -if WITH_ALT_HSBUILD -ZERO_PATCHES = -else +# Zero patches ZERO_PATCHES = \ - patches/icedtea-hotspot-6b14-7b24.patch \ - patches/icedtea-hotspot7-build-fixes.patch -endif -ZERO_PATCHES += \ patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ patches/icedtea-signature-iterator.patch \ patches/icedtea-test-atomic-operations.patch \ @@ -476,27 +468,23 @@ patches/icedtea-ia64-bugfix.patch \ patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch -if !WITH_ALT_HSBUILD -ZERO_PATCHES += \ - patches/icedtea-signed-types.patch \ - patches/icedtea-hotspot-citypeflow.patch +if ZERO_BUILD + ZERO_PATCHES_COND = $(ZERO_PATCHES) +else + ZERO_PATCHES_COND = endif -# Patches needed when not using the newer OpenJDK 7 HotSpot for zero. -NON_ZERO_PATCHES = \ +# 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 ZERO_BUILD - ZERO_PATCHES_COND = $(ZERO_PATCHES) +if WITH_ALT_HSBUILD + OLD_HOTSPOT_PATCHES_COND = else -if WITH_ALT_HSBUILD - ZERO_PATCHES_COND = -else - ZERO_PATCHES_COND = $(NON_ZERO_PATCHES) -endif + OLD_HOTSPOT_PATCHES_COND = $(OLD_HOTSPOT_PATCHES) endif # If Shark is required, apply shark patch @@ -510,6 +498,7 @@ ICEDTEA_PATCHES = \ $(ZERO_PATCHES_COND) \ + $(OLD_HOTSPOT_PATCHES_COND) \ patches/icedtea-version.patch \ patches/hotspot/$(HSBUILD)/icedtea-version.patch \ patches/icedtea-copy-plugs.patch \ @@ -539,22 +528,8 @@ patches/icedtea-javafiles.patch \ patches/icedtea-core-build.patch \ patches/icedtea-jvmtiEnv.patch \ - patches/icedtea-lcms.patch - -if WITH_ALT_HSBUILD -ICEDTEA_PATCHES += \ - patches/hotspot/$(HSBUILD)/icedtea-core-build.patch -else -if ZERO_BUILD -ICEDTEA_PATCHES += \ - patches/hotspot/$(HSBUILD)/icedtea-core-zero-build.patch -else -ICEDTEA_PATCHES += \ - patches/hotspot/$(HSBUILD)/icedtea-core-build.patch -endif -endif - -ICEDTEA_PATCHES += \ + patches/icedtea-lcms.patch \ + patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \ patches/icedtea-linker-options.patch \ patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \ patches/icedtea-timerqueue.patch \ @@ -615,7 +590,6 @@ if !WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ - patches/icedtea-bytecodeInterpreterWithChecks.patch \ patches/icedtea-sparc.patch endif diff -r c5c31d555ae3 patches/hotspot/original/icedtea-core-zero-build.patch --- a/patches/hotspot/original/icedtea-core-zero-build.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ ---- openjdk/hotspot/make/Makefile.orig 2008-11-25 09:11:57.000000000 +0000 -+++ openjdk/hotspot/make/Makefile 2008-12-05 16:54:54.000000000 +0000 -@@ -91,6 +91,15 @@ - all_debug: jvmg jvmg1 jvmgkernel docs export_debug - all_optimized: optimized optimized1 optimizedkernel docs export_optimized - -+# Core (non-compiler) targets made available with this Makefile -+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore -+ -+allcore: all_productcore all_fastdebugcore -+all_productcore: productcore docs export_product -+all_fastdebugcore: fastdebugcore docs export_fastdebug -+all_debugcore: jvmgcore docs export_debug -+all_optimizedcore: optimizedcore docs export_optimized -+ - # Do everything - world: all create_jdk - -@@ -113,6 +122,10 @@ - $(CD) $(GAMMADIR)/make; \ - $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT) - -+$(CORE_VM_TARGETS): -+ $(CD) $(GAMMADIR)/make; \ -+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT) -+ - $(KERNEL_VM_TARGETS): - $(CD) $(GAMMADIR)/make; \ - $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT) -@@ -159,6 +172,12 @@ - $(MAKE_ARGS) $(VM_TARGET) - endif - -+generic_buildcore: -+ $(MKDIR) -p $(OUTPUTDIR) -+ $(CD) $(OUTPUTDIR); \ -+ $(MAKE) -f $(ABS_OS_MAKEFILE) \ -+ $(MAKE_ARGS) $(VM_TARGET) -+ - generic_buildkernel: - $(MKDIR) -p $(OUTPUTDIR) - ifeq ($(OSNAME),windows) -@@ -205,13 +224,21 @@ - XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt - DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs - C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 -+ifdef ICEDTEA_CORE_BUILD -+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core -+else - C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 -+endif - KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel - C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR) - C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) - KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR) - - # Misc files and generated files need to come from C1 or C2 area -+ifdef ICEDTEA_CORE_BUILD -+ MISC_DIR=$(C2_DIR) -+ GEN_DIR=$(C2_BASE_DIR)/generated -+else - ifeq ($(ARCH_DATA_MODEL), 32) - MISC_DIR=$(C1_DIR) - GEN_DIR=$(C1_BASE_DIR)/generated -@@ -219,6 +246,7 @@ - MISC_DIR=$(C2_DIR) - GEN_DIR=$(C2_BASE_DIR)/generated - endif -+endif - - # Bin files (windows) - ifeq ($(OSNAME),windows) ---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-12-05 16:54:13.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-05 16:54:54.000000000 +0000 -@@ -89,8 +89,12 @@ - #ifdef TIERED - #define VMTYPE "Server" - #else -- #define VMTYPE COMPILER1_PRESENT("Client") \ -- COMPILER2_PRESENT("Server") -+#if defined(COMPILER1) || defined(COMPILER2) -+ #define VMTYPE COMPILER1_PRESENT("Client") \ -+ COMPILER2_PRESENT("Server") -+#else -+ #define VMTYPE "Core" -+#endif // COMPILER1 || COMPILER2 - #endif // TIERED - - #ifndef HOTSPOT_VM_DISTRO ---- openjdk/hotspot/build/linux/makefiles/defs.make.orig 2008-11-25 09:11:51.000000000 +0000 -+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-12-05 16:54:54.000000000 +0000 -@@ -97,6 +97,7 @@ - EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so -+ifndef ICEDTEA_CORE_BUILD - ifeq ($(ARCH_DATA_MODEL), 32) - EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt -@@ -111,3 +112,4 @@ - EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar - endif - endif -+endif diff -r c5c31d555ae3 patches/icedtea-bytecodeInterpreterWithChecks.patch --- a/patches/icedtea-bytecodeInterpreterWithChecks.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ ---- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2007-10-12 03:46:08.000000000 -0400 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2007-10-29 11:57:33.000000000 -0400 -@@ -6,6 +6,7 @@ - - - -+ - - - #define VM_JVMTI -@@ -15,7 +16,6 @@ - - - -- - - - diff -r c5c31d555ae3 patches/icedtea-hotspot-6b14-7b24.patch --- a/patches/icedtea-hotspot-6b14-7b24.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13966 +0,0 @@ -diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/BuildConfig.java openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java ---- openjdk6/hotspot/src/share/tools/MakeDeps/BuildConfig.java 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java 2008-12-05 16:41:21.727631421 +0100 -@@ -704,6 +704,3 @@ - receiver.add(attr); receiver.add(value); - } - } -- -- -- -diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/Macro.java openjdk/hotspot/src/share/tools/MakeDeps/Macro.java ---- openjdk6/hotspot/src/share/tools/MakeDeps/Macro.java 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/tools/MakeDeps/Macro.java 2008-12-05 16:41:21.727631421 +0100 -@@ -26,4 +26,3 @@ - public String name; - public String contents; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlc.hpp openjdk/hotspot/src/share/vm/adlc/adlc.hpp ---- openjdk6/hotspot/src/share/vm/adlc/adlc.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2008-12-05 16:41:21.737631572 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)adlc.hpp 1.28 07/05/05 17:04:59 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlparse.cpp openjdk/hotspot/src/share/vm/adlc/adlparse.cpp ---- openjdk6/hotspot/src/share/vm/adlc/adlparse.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/adlparse.cpp 2008-12-05 16:41:21.737631572 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)adlparse.cpp 1.205 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlparse.hpp openjdk/hotspot/src/share/vm/adlc/adlparse.hpp ---- openjdk6/hotspot/src/share/vm/adlc/adlparse.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/adlparse.hpp 2008-12-05 16:41:21.737631572 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)adlparse.hpp 1.79 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -273,5 +270,3 @@ - static bool is_int_token(const char* token, int& intval); - static void trim(char* &token); // trim leading & trailing spaces - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/archDesc.cpp openjdk/hotspot/src/share/vm/adlc/archDesc.cpp ---- openjdk6/hotspot/src/share/vm/adlc/archDesc.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/archDesc.cpp 2008-12-05 16:41:21.737631572 +0100 -@@ -22,6 +22,7 @@ - // - // - -+ - // archDesc.cpp - Internal format for architecture definition - #include "adlc.hpp" - -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/arena.cpp openjdk/hotspot/src/share/vm/adlc/arena.cpp ---- openjdk6/hotspot/src/share/vm/adlc/arena.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/arena.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)arena.cpp 1.16 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -173,4 +170,3 @@ - void CHeapObj::operator delete(void* p){ - free(p); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/arena.hpp openjdk/hotspot/src/share/vm/adlc/arena.hpp ---- openjdk6/hotspot/src/share/vm/adlc/arena.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/arena.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)arena.hpp 1.17 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -158,4 +155,3 @@ - size_t size_in_bytes() const { return _size_in_bytes; } - void set_size_in_bytes(size_t size) { _size_in_bytes = size; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dfa.cpp openjdk/hotspot/src/share/vm/adlc/dfa.cpp ---- openjdk6/hotspot/src/share/vm/adlc/dfa.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/dfa.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dfa.cpp 1.83 07/05/05 17:04:59 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1022,4 +1019,3 @@ - void ProductionState::print() { - _production.print(print_key, print_production); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dict2.cpp openjdk/hotspot/src/share/vm/adlc/dict2.cpp ---- openjdk6/hotspot/src/share/vm/adlc/dict2.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/dict2.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dict2.cpp 1.19 07/05/05 17:04:59 JVM" --#endif - /* - * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -354,5 +351,3 @@ - } - _key = _value = NULL; - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dict2.hpp openjdk/hotspot/src/share/vm/adlc/dict2.hpp ---- openjdk6/hotspot/src/share/vm/adlc/dict2.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/dict2.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)dict2.hpp 1.16 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1998-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -121,5 +118,3 @@ - }; - - #endif // _DICT_ -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/filebuff.cpp openjdk/hotspot/src/share/vm/adlc/filebuff.cpp ---- openjdk6/hotspot/src/share/vm/adlc/filebuff.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)filebuff.cpp 1.30 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -297,4 +294,3 @@ - va_end(args); - _AD._no_output = 1; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/filebuff.hpp openjdk/hotspot/src/share/vm/adlc/filebuff.hpp ---- openjdk6/hotspot/src/share/vm/adlc/filebuff.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)filebuff.hpp 1.27 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/forms.cpp openjdk/hotspot/src/share/vm/adlc/forms.cpp ---- openjdk6/hotspot/src/share/vm/adlc/forms.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/forms.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)forms.cpp 1.161 07/05/05 17:04:59 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -386,4 +383,3 @@ - void SourceForm::output(FILE *fp) { - fprintf(fp,"\n//%s\n%s\n",classname(),(_code?_code:"")); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/forms.hpp openjdk/hotspot/src/share/vm/adlc/forms.hpp ---- openjdk6/hotspot/src/share/vm/adlc/forms.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/forms.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)forms.hpp 1.150 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -587,6 +584,3 @@ - void print_asserts(FILE *fp); - void dump(); - }; -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formsopt.cpp openjdk/hotspot/src/share/vm/adlc/formsopt.cpp ---- openjdk6/hotspot/src/share/vm/adlc/formsopt.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)formsopt.cpp 1.53 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -725,4 +722,3 @@ - void PeepReplace::output(FILE *fp) { // Write info to output files - fprintf(fp,"PeepReplace:\n"); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formsopt.hpp openjdk/hotspot/src/share/vm/adlc/formsopt.hpp ---- openjdk6/hotspot/src/share/vm/adlc/formsopt.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/formsopt.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)formsopt.hpp 1.54 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -549,4 +546,3 @@ - void dump(); - void output(FILE *fp); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formssel.cpp openjdk/hotspot/src/share/vm/adlc/formssel.cpp ---- openjdk6/hotspot/src/share/vm/adlc/formssel.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/formssel.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)formssel.cpp 1.185 07/09/28 10:23:26 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -4000,4 +3997,3 @@ - fprintf(fp,"\nFormat Rule: \n%s", (_temp?_temp:"")); - fprintf(fp,"\n"); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formssel.hpp openjdk/hotspot/src/share/vm/adlc/formssel.hpp ---- openjdk6/hotspot/src/share/vm/adlc/formssel.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/formssel.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)formssel.hpp 1.77 07/07/19 19:08:28 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/output_c.cpp openjdk/hotspot/src/share/vm/adlc/output_c.cpp ---- openjdk6/hotspot/src/share/vm/adlc/output_c.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/output_c.cpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)output_c.cpp 1.185 07/07/02 16:50:40 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/output_h.cpp openjdk/hotspot/src/share/vm/adlc/output_h.cpp ---- openjdk6/hotspot/src/share/vm/adlc/output_h.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/output_h.cpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)output_h.cpp 1.180 07/09/28 10:23:25 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/asm/assembler.cpp openjdk/hotspot/src/share/vm/asm/assembler.cpp ---- openjdk6/hotspot/src/share/vm/asm/assembler.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/asm/assembler.cpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)assembler.cpp 1.41 07/05/05 17:05:03 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/asm/assembler.hpp openjdk/hotspot/src/share/vm/asm/assembler.hpp ---- openjdk6/hotspot/src/share/vm/asm/assembler.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/asm/assembler.hpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)assembler.hpp 1.52 07/05/05 17:05:03 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/asm/assembler.inline.hpp openjdk/hotspot/src/share/vm/asm/assembler.inline.hpp ---- openjdk6/hotspot/src/share/vm/asm/assembler.inline.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/asm/assembler.inline.hpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)assembler.inline.hpp 1.27 07/05/05 17:05:03 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/asm/codeBuffer.cpp openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp ---- openjdk6/hotspot/src/share/vm/asm/codeBuffer.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)codeBuffer.cpp 1.100 07/05/05 17:05:03 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/asm/codeBuffer.hpp openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp ---- openjdk6/hotspot/src/share/vm/asm/codeBuffer.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)codeBuffer.hpp 1.63 07/05/17 15:49:26 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -543,4 +540,3 @@ - if (remaining() < amount) { _outer->expand(this, amount); return true; } - return false; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/asm/register.cpp openjdk/hotspot/src/share/vm/asm/register.cpp ---- openjdk6/hotspot/src/share/vm/asm/register.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/asm/register.cpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)register.cpp 1.11 07/05/05 17:05:04 JVM" --#endif - /* - * Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/asm/register.hpp openjdk/hotspot/src/share/vm/asm/register.hpp ---- openjdk6/hotspot/src/share/vm/asm/register.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/asm/register.hpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)register.hpp 1.13 07/05/05 17:05:03 JVM" --#endif - /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp openjdk/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_CFGPrinter.cpp 1.8 07/05/05 17:05:04 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp openjdk/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_CFGPrinter.hpp 1.7 07/05/05 17:05:05 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -47,4 +44,3 @@ - }; - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp openjdk/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_Canonicalizer.cpp 1.57 07/05/05 17:05:05 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp openjdk/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp 2008-12-05 16:41:21.757631873 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_Canonicalizer.hpp 1.29 07/05/05 17:05:05 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -97,4 +94,3 @@ - virtual void do_ProfileCall (ProfileCall* x); - virtual void do_ProfileCounter (ProfileCounter* x); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_CodeStubs.hpp openjdk/hotspot/src/share/vm/c1/c1_CodeStubs.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_CodeStubs.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_CodeStubs.hpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_CodeStubs.hpp 1.86 07/05/05 17:05:06 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -485,4 +482,3 @@ - virtual void print_name(outputStream* out) const { out->print("ArrayCopyStub"); } - #endif // PRODUCT - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Compilation.cpp openjdk/hotspot/src/share/vm/c1/c1_Compilation.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Compilation.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Compilation.cpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_Compilation.cpp 1.160 07/06/18 14:25:23 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Compilation.hpp openjdk/hotspot/src/share/vm/c1/c1_Compilation.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Compilation.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Compilation.hpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_Compilation.hpp 1.88 07/05/17 15:49:31 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Compiler.cpp openjdk/hotspot/src/share/vm/c1/c1_Compiler.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Compiler.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Compiler.cpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_Compiler.cpp 1.105 07/05/05 17:05:06 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -89,5 +86,3 @@ - void Compiler::print_timers() { - Compilation::print_timers(); - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Compiler.hpp openjdk/hotspot/src/share/vm/c1/c1_Compiler.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Compiler.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Compiler.hpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_Compiler.hpp 1.49 07/05/05 17:05:06 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -68,4 +65,3 @@ - // Print compilation timers and statistics - virtual void print_timers(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Defs.cpp openjdk/hotspot/src/share/vm/c1/c1_Defs.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Defs.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Defs.cpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_Defs.cpp 1.10 07/05/05 17:05:06 JVM" --#endif - /* - * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -27,4 +24,3 @@ - - #include "incls/_precompiled.incl" - #include "incls/_c1_Defs.cpp.incl" -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Defs.hpp openjdk/hotspot/src/share/vm/c1/c1_Defs.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Defs.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Defs.hpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_Defs.hpp 1.22 07/05/05 17:05:05 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp openjdk/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_FpuStackSim.hpp 1.7 07/05/05 17:05:06 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -30,4 +27,3 @@ - class FpuStackSim; - - # include "incls/_c1_FpuStackSim_pd.hpp.incl" // platform dependent declarations -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_FrameMap.cpp openjdk/hotspot/src/share/vm/c1/c1_FrameMap.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_FrameMap.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_FrameMap.cpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_FrameMap.cpp 1.38 07/06/18 14:25:23 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_FrameMap.hpp openjdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_FrameMap.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_FrameMap.hpp 1.59 07/05/05 17:05:07 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_GraphBuilder.cpp 1.256 07/06/18 14:25:23 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_GraphBuilder.hpp 1.75 07/05/17 15:49:37 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -391,4 +388,3 @@ - - BlockBegin* start() const { return _start; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_IR.cpp openjdk/hotspot/src/share/vm/c1/c1_IR.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_IR.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_IR.cpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_IR.cpp 1.161 08/11/07 15:47:10 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -577,23 +574,12 @@ - TRACE_LINEAR_SCAN(3, tty->print_cr("backward branch")); - assert(is_visited(cur), "block must be visisted when block is active"); - assert(parent != NULL, "must have parent"); -+ assert(parent->number_of_sux() == 1, "loop end blocks must have one successor (critical edges are split)"); - - cur->set(BlockBegin::linear_scan_loop_header_flag); - cur->set(BlockBegin::backward_branch_target_flag); - - parent->set(BlockBegin::linear_scan_loop_end_flag); -- -- // When a loop header is also the start of an exception handler, then the backward branch is -- // an exception edge. Because such edges are usually critical edges which cannot be split, the -- // loop must be excluded here from processing. -- if (cur->is_set(BlockBegin::exception_entry_flag)) { -- // Make sure that dominators are correct in this weird situation -- _iterative_dominators = true; -- return; -- } -- assert(parent->number_of_sux() == 1 && parent->sux_at(0) == cur, -- "loop end blocks must have one successor (critical edges are split)"); -- - _loop_end_blocks.append(parent); - return; - } -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_IR.hpp openjdk/hotspot/src/share/vm/c1/c1_IR.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_IR.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_IR.hpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_IR.hpp 1.100 07/05/05 17:05:04 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Instruction.cpp openjdk/hotspot/src/share/vm/c1/c1_Instruction.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Instruction.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Instruction.cpp 2008-12-05 16:41:21.767632024 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_Instruction.cpp 1.90 07/05/05 17:05:05 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Instruction.hpp openjdk/hotspot/src/share/vm/c1/c1_Instruction.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Instruction.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Instruction.hpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_Instruction.hpp 1.196 07/06/18 14:25:24 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp openjdk/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_InstructionPrinter.cpp 1.126 07/06/18 14:25:24 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -851,4 +848,3 @@ - - - #endif // PRODUCT -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp openjdk/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_InstructionPrinter.hpp 1.65 07/05/05 17:05:07 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIR.cpp openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_LIR.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_LIR.cpp 1.119 07/06/18 14:25:24 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIR.hpp openjdk/hotspot/src/share/vm/c1/c1_LIR.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_LIR.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.hpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_LIR.hpp 1.134 07/06/18 14:25:24 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -2035,4 +2032,3 @@ - - - inline LIR_Opr LIR_OprDesc::illegalOpr() { return LIR_OprFact::illegalOpr; }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_LIRAssembler.cpp 1.135 07/07/02 16:50:41 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -795,6 +792,3 @@ - } - #endif - } -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_LIRAssembler.hpp 1.116 07/05/05 17:05:08 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_LIRGenerator.cpp 1.24 08/11/07 15:47:10 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1222,8 +1219,8 @@ - break; - case T_LONG: - case T_DOUBLE: -- if (c->as_jint_hi_bits() != other->as_jint_hi_bits()) continue; -- if (c->as_jint_lo_bits() != other->as_jint_lo_bits()) continue; -+ if (c->as_jint_hi_bits() != other->as_jint_lo_bits()) continue; -+ if (c->as_jint_lo_bits() != other->as_jint_hi_bits()) continue; - break; - case T_OBJECT: - if (c->as_jobject() != other->as_jobject()) continue; -@@ -2535,5 +2532,3 @@ - } - #endif - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp 2008-12-05 16:41:21.777632175 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_LIRGenerator.hpp 1.14 07/06/18 14:25:25 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LinearScan.cpp openjdk/hotspot/src/share/vm/c1/c1_LinearScan.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_LinearScan.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LinearScan.cpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_LinearScan.cpp 1.14 07/08/14 16:07:30 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LinearScan.hpp openjdk/hotspot/src/share/vm/c1/c1_LinearScan.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_LinearScan.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_LinearScan.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_LinearScan.hpp 1.13 07/08/14 16:07:30 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp openjdk/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_MacroAssembler.hpp 1.23 07/05/05 17:05:08 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -83,5 +80,3 @@ - int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2); - int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2, Register arg3); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Optimizer.cpp openjdk/hotspot/src/share/vm/c1/c1_Optimizer.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Optimizer.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Optimizer.cpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_Optimizer.cpp 1.72 08/11/07 15:47:10 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -330,6 +327,8 @@ - BlockBegin* fsux = if_->fsux(); - if (swapped) { - cond = Instruction::mirror(cond); -+ tsux = if_->fsux(); -+ fsux = if_->tsux(); - } - - BlockBegin* tblock = tval->compare(cond, con, tsux, fsux); -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Optimizer.hpp openjdk/hotspot/src/share/vm/c1/c1_Optimizer.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Optimizer.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Optimizer.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_Optimizer.hpp 1.16 07/05/05 17:05:09 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -38,4 +35,3 @@ - void eliminate_blocks(); - void eliminate_null_checks(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Runtime1.cpp openjdk/hotspot/src/share/vm/c1/c1_Runtime1.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Runtime1.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Runtime1.cpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_Runtime1.cpp 1.245 08/11/07 15:47:09 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -858,13 +855,6 @@ - if (TracePatching) { - tty->print_cr("Deoptimizing for patching volatile field reference"); - } -- // It's possible the nmethod was invalidated in the last -- // safepoint, but if it's still alive then make it not_entrant. -- nmethod* nm = CodeCache::find_nmethod(caller_frame.pc()); -- if (nm != NULL) { -- nm->make_not_entrant(); -- } -- - VM_DeoptimizeFrame deopt(thread, caller_frame.id()); - VMThread::execute(&deopt); - -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Runtime1.hpp openjdk/hotspot/src/share/vm/c1/c1_Runtime1.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_Runtime1.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_Runtime1.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_Runtime1.hpp 1.140 07/05/17 15:49:48 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueMap.cpp openjdk/hotspot/src/share/vm/c1/c1_ValueMap.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_ValueMap.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_ValueMap.cpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_ValueMap.cpp 1.29 07/05/05 17:05:08 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueMap.hpp openjdk/hotspot/src/share/vm/c1/c1_ValueMap.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_ValueMap.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_ValueMap.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_ValueMap.hpp 1.22 07/05/05 17:05:07 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueSet.cpp openjdk/hotspot/src/share/vm/c1/c1_ValueSet.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_ValueSet.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_ValueSet.cpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_ValueSet.cpp 1.12 07/05/05 17:05:09 JVM" --#endif - /* - * Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueSet.hpp openjdk/hotspot/src/share/vm/c1/c1_ValueSet.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_ValueSet.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_ValueSet.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_ValueSet.hpp 1.15 07/05/05 17:05:09 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueStack.cpp openjdk/hotspot/src/share/vm/c1/c1_ValueStack.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_ValueStack.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_ValueStack.cpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_ValueStack.cpp 1.65 07/05/05 17:05:09 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -286,4 +283,3 @@ - Unimplemented(); - } - #endif // PRODUCT -- -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueStack.hpp openjdk/hotspot/src/share/vm/c1/c1_ValueStack.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_ValueStack.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_ValueStack.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_ValueStack.hpp 1.51 07/05/05 17:05:10 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueType.cpp openjdk/hotspot/src/share/vm/c1/c1_ValueType.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_ValueType.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_ValueType.cpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_ValueType.cpp 1.22 07/05/05 17:05:10 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueType.hpp openjdk/hotspot/src/share/vm/c1/c1_ValueType.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_ValueType.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_ValueType.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_ValueType.hpp 1.35 07/05/05 17:05:10 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_globals.cpp openjdk/hotspot/src/share/vm/c1/c1_globals.cpp ---- openjdk6/hotspot/src/share/vm/c1/c1_globals.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_globals.cpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c1_globals.cpp 1.11 07/05/05 17:05:09 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_globals.hpp openjdk/hotspot/src/share/vm/c1/c1_globals.hpp ---- openjdk6/hotspot/src/share/vm/c1/c1_globals.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/c1/c1_globals.hpp 2008-12-05 16:41:21.787632326 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_globals.hpp 1.104 07/05/05 17:05:10 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -333,4 +330,3 @@ - // #include "incls/_c1_globals_pd.hpp.incl" - - C1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_NOTPRODUCT_FLAG) -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp openjdk/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp ---- openjdk6/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bcEscapeAnalyzer.cpp 1.7 07/05/17 15:49:50 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1322,4 +1319,3 @@ - deps->assert_unique_concrete_method(k, m); - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp openjdk/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp ---- openjdk6/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bcEscapeAnalyzer.hpp 1.6 07/05/05 17:05:11 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArray.cpp openjdk/hotspot/src/share/vm/ci/ciArray.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciArray.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciArray.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciArray.cpp 1.13 07/09/28 10:23:25 JVM" --#endif - /* - * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArray.hpp openjdk/hotspot/src/share/vm/ci/ciArray.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciArray.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciArray.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciArray.hpp 1.13 07/09/28 10:23:25 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArrayKlass.cpp openjdk/hotspot/src/share/vm/ci/ciArrayKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciArrayKlass.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciArrayKlass.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciArrayKlass.cpp 1.14 07/05/05 17:05:12 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArrayKlass.hpp openjdk/hotspot/src/share/vm/ci/ciArrayKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciArrayKlass.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciArrayKlass.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciArrayKlass.hpp 1.15 07/05/05 17:05:12 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciArrayKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciArrayKlassKlass.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciArrayKlassKlass.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciArrayKlassKlass.hpp 1.12 07/05/05 17:05:12 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciCallProfile.hpp openjdk/hotspot/src/share/vm/ci/ciCallProfile.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciCallProfile.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciCallProfile.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciCallProfile.hpp 1.17 07/05/05 17:05:12 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciClassList.hpp openjdk/hotspot/src/share/vm/ci/ciClassList.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciClassList.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciClassList.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciClassList.hpp 1.21 07/05/05 17:05:11 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciConstant.cpp openjdk/hotspot/src/share/vm/ci/ciConstant.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciConstant.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciConstant.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciConstant.cpp 1.13 07/05/05 17:05:12 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciConstant.hpp openjdk/hotspot/src/share/vm/ci/ciConstant.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciConstant.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciConstant.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciConstant.hpp 1.18 07/09/28 10:23:25 JVM" --#endif - /* - * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -113,4 +110,3 @@ - // Debugging output - void print(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp openjdk/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciConstantPoolCache.cpp 1.12 07/05/05 17:05:12 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp openjdk/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciConstantPoolCache.hpp 1.11 07/05/05 17:05:11 JVM" --#endif - /* - * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -48,4 +45,3 @@ - - void print(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciEnv.cpp openjdk/hotspot/src/share/vm/ci/ciEnv.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciEnv.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciEnv.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciEnv.cpp 1.128 07/05/17 15:49:53 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciEnv.hpp openjdk/hotspot/src/share/vm/ci/ciEnv.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciEnv.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciEnv.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciEnv.hpp 1.70 07/05/05 17:05:11 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -360,5 +357,3 @@ - void record_method_not_compilable(const char* reason, bool all_tiers = true); - void record_out_of_memory_failure(); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciExceptionHandler.cpp openjdk/hotspot/src/share/vm/ci/ciExceptionHandler.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciExceptionHandler.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciExceptionHandler.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciExceptionHandler.cpp 1.12 07/05/05 17:05:13 JVM" --#endif - /* - * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciExceptionHandler.hpp openjdk/hotspot/src/share/vm/ci/ciExceptionHandler.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciExceptionHandler.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciExceptionHandler.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciExceptionHandler.hpp 1.12 07/05/05 17:05:13 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -76,4 +73,3 @@ - - void print(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciField.cpp openjdk/hotspot/src/share/vm/ci/ciField.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciField.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciField.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciField.cpp 1.34 07/08/27 14:10:22 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciField.hpp openjdk/hotspot/src/share/vm/ci/ciField.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciField.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciField.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciField.hpp 1.23 07/09/28 10:23:24 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciFlags.cpp openjdk/hotspot/src/share/vm/ci/ciFlags.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciFlags.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciFlags.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciFlags.cpp 1.12 07/09/28 10:23:24 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciFlags.hpp openjdk/hotspot/src/share/vm/ci/ciFlags.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciFlags.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciFlags.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciFlags.hpp 1.15 07/09/28 10:23:24 JVM" --#endif - /* - * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstance.cpp openjdk/hotspot/src/share/vm/ci/ciInstance.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciInstance.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciInstance.cpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciInstance.cpp 1.17 07/09/28 10:23:24 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstance.hpp openjdk/hotspot/src/share/vm/ci/ciInstance.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciInstance.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciInstance.hpp 2008-12-05 16:41:21.797632477 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciInstance.hpp 1.15 07/09/28 10:23:24 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -62,4 +59,3 @@ - // Constant value of a field at the specified offset. - ciConstant field_value_by_offset(int field_offset); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstanceKlass.cpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciInstanceKlass.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciInstanceKlass.cpp 1.45 07/09/28 10:23:23 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstanceKlass.hpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciInstanceKlass.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciInstanceKlass.hpp 1.36 07/09/28 10:23:23 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -190,4 +187,3 @@ - bool is_instance_klass() { return true; } - bool is_java_klass() { return true; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstanceKlassKlass.cpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlassKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciInstanceKlassKlass.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlassKlass.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciInstanceKlassKlass.cpp 1.10 07/05/05 17:05:14 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstanceKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciInstanceKlassKlass.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlassKlass.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciInstanceKlassKlass.hpp 1.12 07/05/05 17:05:14 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciKlass.cpp openjdk/hotspot/src/share/vm/ci/ciKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciKlass.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciKlass.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciKlass.cpp 1.31 07/09/28 10:23:23 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -236,4 +233,3 @@ - void ciKlass::print_name_on(outputStream* st) { - name()->print_symbol_on(st); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciKlass.hpp openjdk/hotspot/src/share/vm/ci/ciKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciKlass.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciKlass.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciKlass.hpp 1.27 07/09/28 10:23:23 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -120,4 +117,3 @@ - - void print_name_on(outputStream* st); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciKlassKlass.cpp openjdk/hotspot/src/share/vm/ci/ciKlassKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciKlassKlass.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciKlassKlass.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciKlassKlass.cpp 1.10 07/05/05 17:05:14 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciKlassKlass.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciKlassKlass.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciKlassKlass.hpp 1.13 07/05/05 17:05:14 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -52,4 +49,3 @@ - // Return the distinguished ciKlassKlass instance. - static ciKlassKlass* make(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethod.cpp openjdk/hotspot/src/share/vm/ci/ciMethod.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciMethod.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciMethod.cpp 1.109 07/09/28 10:23:23 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1043,5 +1040,3 @@ - st->print(" loaded=false"); - } - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethod.hpp openjdk/hotspot/src/share/vm/ci/ciMethod.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciMethod.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciMethod.hpp 1.64 07/09/28 10:23:22 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -247,4 +244,3 @@ - void print_name(outputStream* st = tty); - void print_short_name(outputStream* st = tty); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodBlocks.cpp openjdk/hotspot/src/share/vm/ci/ciMethodBlocks.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciMethodBlocks.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciMethodBlocks.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciMethodBlocks.cpp 1.6 07/09/28 10:23:22 JVM" --#endif - /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodBlocks.hpp openjdk/hotspot/src/share/vm/ci/ciMethodBlocks.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciMethodBlocks.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciMethodBlocks.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciMethodBlocks.hpp 1.5 07/05/05 17:05:14 JVM" --#endif - /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodData.cpp openjdk/hotspot/src/share/vm/ci/ciMethodData.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciMethodData.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciMethodData.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciMethodData.cpp 1.29 07/09/28 10:23:22 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodData.hpp openjdk/hotspot/src/share/vm/ci/ciMethodData.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciMethodData.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciMethodData.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciMethodData.hpp 1.28 07/09/28 10:23:22 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodKlass.cpp openjdk/hotspot/src/share/vm/ci/ciMethodKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciMethodKlass.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciMethodKlass.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciMethodKlass.cpp 1.10 07/05/05 17:05:15 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodKlass.hpp openjdk/hotspot/src/share/vm/ci/ciMethodKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciMethodKlass.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciMethodKlass.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciMethodKlass.hpp 1.13 07/05/05 17:05:15 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -49,4 +46,3 @@ - // Return the distinguished ciMethodKlass instance. - static ciMethodKlass* make(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciNullObject.cpp openjdk/hotspot/src/share/vm/ci/ciNullObject.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciNullObject.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciNullObject.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciNullObject.cpp 1.12 07/09/28 10:23:22 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -49,4 +46,3 @@ - ciNullObject* ciNullObject::make() { - return CURRENT_ENV->_null_object_instance->as_null_object(); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciNullObject.hpp openjdk/hotspot/src/share/vm/ci/ciNullObject.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciNullObject.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciNullObject.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciNullObject.hpp 1.13 07/09/28 10:23:21 JVM" --#endif - /* - * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -50,5 +47,3 @@ - // Get the distinguished instance of this klass. - static ciNullObject* make(); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArray.cpp openjdk/hotspot/src/share/vm/ci/ciObjArray.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciObjArray.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObjArray.cpp 1970-01-01 01:00:00.000000000 +0100 -@@ -1,46 +0,0 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciObjArray.cpp 1.1 07/10/23 13:12:37 JVM" --#endif --/* -- * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. -- * 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. -- * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. -- * -- */ -- --#include "incls/_precompiled.incl" --#include "incls/_ciObjArray.cpp.incl" -- --// ciObjArray --// --// This class represents an objArrayOop in the HotSpot virtual --// machine. -- --ciObject* ciObjArray::obj_at(int index) { -- VM_ENTRY_MARK; -- objArrayOop array = get_objArrayOop(); -- if (index < 0 || index >= array->length()) return NULL; -- oop o = array->obj_at(index); -- if (o == NULL) { -- return ciNullObject::make(); -- } else { -- return CURRENT_ENV->get_object(o); -- } --} -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArray.hpp openjdk/hotspot/src/share/vm/ci/ciObjArray.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciObjArray.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObjArray.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciObjArray.hpp 1.13 07/10/23 13:12:55 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -46,6 +43,4 @@ - public: - // What kind of ciObject is this? - bool is_obj_array() { return true; } -- -- ciObject* obj_at(int index); - }; -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciObjArrayKlass.cpp 1.23 07/05/05 17:05:15 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciObjArrayKlass.hpp 1.14 07/05/05 17:05:16 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -72,4 +69,3 @@ - - static ciObjArrayKlass* make(ciKlass* element_klass); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.cpp openjdk/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.cpp 2008-12-05 16:41:21.807632628 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciObjArrayKlassKlass.cpp 1.10 07/05/05 17:05:15 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciObjArrayKlassKlass.hpp 1.12 07/05/05 17:05:16 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -51,4 +48,3 @@ - // Return the distinguished ciObjArrayKlassKlass instance. - static ciObjArrayKlassKlass* make(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObject.cpp openjdk/hotspot/src/share/vm/ci/ciObject.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciObject.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObject.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciObject.cpp 1.29 07/09/28 10:23:21 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -216,4 +213,3 @@ - GUARDED_VM_ENTRY(get_oop()->print_on(st);) - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObject.hpp openjdk/hotspot/src/share/vm/ci/ciObject.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciObject.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObject.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciObject.hpp 1.26 07/09/28 10:23:21 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -261,4 +258,3 @@ - // Print debugging output about the oop this ciObject represents. - void print_oop(outputStream* st = tty); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjectFactory.cpp openjdk/hotspot/src/share/vm/ci/ciObjectFactory.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciObjectFactory.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObjectFactory.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciObjectFactory.cpp 1.39 07/05/17 15:50:05 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -648,4 +645,3 @@ - _ci_objects->length(), _unloaded_methods->length(), - _unloaded_klasses->length()); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjectFactory.hpp openjdk/hotspot/src/share/vm/ci/ciObjectFactory.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciObjectFactory.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciObjectFactory.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciObjectFactory.hpp 1.20 07/05/17 15:50:07 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -111,5 +108,3 @@ - void print_contents(); - void print(); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSignature.cpp openjdk/hotspot/src/share/vm/ci/ciSignature.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciSignature.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciSignature.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciSignature.cpp 1.21 07/05/05 17:05:16 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -111,4 +108,3 @@ - _accessing_klass->print(); - tty->print(" address=0x%x>", (address)this); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSignature.hpp openjdk/hotspot/src/share/vm/ci/ciSignature.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciSignature.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciSignature.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciSignature.hpp 1.16 07/05/05 17:05:14 JVM" --#endif - /* - * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -57,6 +54,3 @@ - void print_signature(); - void print(); - }; -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciStreams.cpp openjdk/hotspot/src/share/vm/ci/ciStreams.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciStreams.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciStreams.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciStreams.cpp 1.30 07/05/05 17:05:16 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -368,5 +365,3 @@ - int name_and_type_index = cpool->name_and_type_ref_index_at(method_index); - return cpool->signature_ref_index_at(name_and_type_index); - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciStreams.hpp openjdk/hotspot/src/share/vm/ci/ciStreams.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciStreams.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciStreams.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciStreams.hpp 1.36 07/05/05 17:05:14 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -370,7 +367,3 @@ - return _method->_exception_handlers[_pos]; - } - }; -- -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSymbol.cpp openjdk/hotspot/src/share/vm/ci/ciSymbol.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciSymbol.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciSymbol.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciSymbol.cpp 1.23 07/09/28 10:23:21 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -109,4 +106,3 @@ - ciSymbol* ciSymbol::make(const char* s) { - GUARDED_VM_ENTRY(return make_impl(s);) - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSymbol.hpp openjdk/hotspot/src/share/vm/ci/ciSymbol.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciSymbol.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciSymbol.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciSymbol.hpp 1.16 07/09/28 10:23:21 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSymbolKlass.cpp openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciSymbolKlass.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciSymbolKlass.cpp 1.10 07/05/05 17:05:16 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSymbolKlass.hpp openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciSymbolKlass.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciSymbolKlass.hpp 1.13 07/05/05 17:05:17 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -53,4 +50,3 @@ - // Return the distinguished ciSymbolKlass instance. - static ciSymbolKlass* make(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciType.cpp openjdk/hotspot/src/share/vm/ci/ciType.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciType.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciType.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciType.cpp 1.18 07/09/28 10:23:21 JVM" --#endif - /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciType.hpp openjdk/hotspot/src/share/vm/ci/ciType.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciType.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciType.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciType.hpp 1.15 07/09/28 10:23:20 JVM" --#endif - /* - * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArray.cpp openjdk/hotspot/src/share/vm/ci/ciTypeArray.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciTypeArray.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeArray.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciTypeArray.cpp 1.6 07/05/05 17:05:17 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArray.hpp openjdk/hotspot/src/share/vm/ci/ciTypeArray.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciTypeArray.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeArray.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciTypeArray.hpp 1.13 07/05/05 17:05:17 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciTypeArrayKlass.cpp 1.14 07/05/05 17:05:17 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -56,4 +53,3 @@ - ciTypeArrayKlass* ciTypeArrayKlass::make(BasicType t) { - GUARDED_VM_ENTRY(return make_impl(t);) - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciTypeArrayKlass.hpp 1.13 07/05/05 17:05:17 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.cpp openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.cpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciTypeArrayKlassKlass.cpp 1.10 07/05/05 17:05:17 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.hpp 2008-12-05 16:41:21.817632778 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciTypeArrayKlassKlass.hpp 1.12 07/05/05 17:05:18 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeFlow.cpp openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciTypeFlow.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciTypeFlow.cpp 1.47 07/09/28 10:23:20 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeFlow.hpp openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciTypeFlow.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciTypeFlow.hpp 1.26 08/11/24 12:20:59 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -130,7 +127,7 @@ - - // Used as a combined index for locals and temps - enum Cell { -- Cell_0, Cell_max = INT_MAX -+ Cell_0 - }; - - // A StateVector summarizes the type information at some -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciUtilities.cpp openjdk/hotspot/src/share/vm/ci/ciUtilities.cpp ---- openjdk6/hotspot/src/share/vm/ci/ciUtilities.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciUtilities.cpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ciUtilities.cpp 1.11 07/05/05 17:05:18 JVM" --#endif - /* - * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciUtilities.hpp openjdk/hotspot/src/share/vm/ci/ciUtilities.hpp ---- openjdk6/hotspot/src/share/vm/ci/ciUtilities.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciUtilities.hpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ciUtilities.hpp 1.20 07/05/05 17:05:18 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -107,4 +104,3 @@ - - const char* basictype_to_str(BasicType t); - const char basictype_to_char(BasicType t); -- -diff -ruNb openjdk6/hotspot/src/share/vm/ci/compilerInterface.hpp openjdk/hotspot/src/share/vm/ci/compilerInterface.hpp ---- openjdk6/hotspot/src/share/vm/ci/compilerInterface.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/ci/compilerInterface.hpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compilerInterface.hpp 1.11 07/05/05 17:05:18 JVM" --#endif - /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileError.cpp openjdk/hotspot/src/share/vm/classfile/classFileError.cpp ---- openjdk6/hotspot/src/share/vm/classfile/classFileError.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classFileError.cpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)classFileError.cpp 1.12 07/05/05 17:06:44 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileParser.cpp openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp ---- openjdk6/hotspot/src/share/vm/classfile/classFileParser.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)classFileParser.cpp 1.280 07/07/09 11:19:49 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -4015,4 +4012,3 @@ - } - return NULL; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileParser.hpp openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp ---- openjdk6/hotspot/src/share/vm/classfile/classFileParser.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)classFileParser.hpp 1.85 07/07/09 11:19:50 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileStream.cpp openjdk/hotspot/src/share/vm/classfile/classFileStream.cpp ---- openjdk6/hotspot/src/share/vm/classfile/classFileStream.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classFileStream.cpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)classFileStream.cpp 1.41 07/05/31 14:29:24 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileStream.hpp openjdk/hotspot/src/share/vm/classfile/classFileStream.hpp ---- openjdk6/hotspot/src/share/vm/classfile/classFileStream.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classFileStream.hpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)classFileStream.hpp 1.33 07/05/31 14:29:25 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classLoader.cpp openjdk/hotspot/src/share/vm/classfile/classLoader.cpp ---- openjdk6/hotspot/src/share/vm/classfile/classLoader.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classLoader.cpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)classLoader.cpp 1.188 07/07/16 11:55:31 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classLoader.hpp openjdk/hotspot/src/share/vm/classfile/classLoader.hpp ---- openjdk6/hotspot/src/share/vm/classfile/classLoader.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/classLoader.hpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)classLoader.hpp 1.66 07/07/16 11:55:32 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/dictionary.cpp openjdk/hotspot/src/share/vm/classfile/dictionary.cpp ---- openjdk6/hotspot/src/share/vm/classfile/dictionary.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/dictionary.cpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dictionary.cpp 1.28 08/11/24 12:21:02 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -158,8 +155,8 @@ - for (int i = ik->previous_versions()->length() - 1; i >= 0; i--) { - // check the previous versions array for GC'ed weak refs - PreviousVersionNode * pv_node = ik->previous_versions()->at(i); -- jobject cp_ref = pv_node->prev_constant_pool(); -- assert(cp_ref != NULL, "cp ref was unexpectedly cleared"); -+ jweak cp_ref = pv_node->prev_constant_pool(); -+ assert(cp_ref != NULL, "weak cp ref was unexpectedly cleared"); - if (cp_ref == NULL) { - delete pv_node; - ik->previous_versions()->remove_at(i); -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/dictionary.hpp openjdk/hotspot/src/share/vm/classfile/dictionary.hpp ---- openjdk6/hotspot/src/share/vm/classfile/dictionary.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)dictionary.hpp 1.15 07/05/05 17:05:47 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -220,4 +217,3 @@ - tty->print_cr("pd set = #%d", count); - } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/javaAssertions.cpp openjdk/hotspot/src/share/vm/classfile/javaAssertions.cpp ---- openjdk6/hotspot/src/share/vm/classfile/javaAssertions.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/javaAssertions.cpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)javaAssertions.cpp 1.14 07/05/05 17:06:50 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/javaAssertions.hpp openjdk/hotspot/src/share/vm/classfile/javaAssertions.hpp ---- openjdk6/hotspot/src/share/vm/classfile/javaAssertions.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/javaAssertions.hpp 2008-12-05 16:41:21.827632929 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)javaAssertions.hpp 1.11 07/05/05 17:06:50 JVM" --#endif - /* - * Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/javaClasses.cpp openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp ---- openjdk6/hotspot/src/share/vm/classfile/javaClasses.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)javaClasses.cpp 1.250 08/01/17 09:41:13 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -146,43 +143,13 @@ - jstring js = NULL; - { JavaThread* thread = (JavaThread*)THREAD; - assert(thread->is_Java_thread(), "must be java thread"); -- HandleMark hm(thread); - ThreadToNativeFromVM ttn(thread); -+ HandleMark hm(thread); - js = (_to_java_string_fn)(thread->jni_environment(), str); - } - return Handle(THREAD, JNIHandles::resolve(js)); - } - --// Converts a Java String to a native C string that can be used for --// native OS calls. --char* java_lang_String::as_platform_dependent_str(Handle java_string, TRAPS) { -- -- typedef char* (*to_platform_string_fn_t)(JNIEnv*, jstring, bool*); -- static to_platform_string_fn_t _to_platform_string_fn = NULL; -- -- if (_to_platform_string_fn == NULL) { -- void *lib_handle = os::native_java_library(); -- _to_platform_string_fn = CAST_TO_FN_PTR(to_platform_string_fn_t, hpi::dll_lookup(lib_handle, "GetStringPlatformChars")); -- if (_to_platform_string_fn == NULL) { -- fatal("GetStringPlatformChars missing"); -- } -- } -- -- char *native_platform_string; -- { JavaThread* thread = (JavaThread*)THREAD; -- assert(thread->is_Java_thread(), "must be java thread"); -- JNIEnv *env = thread->jni_environment(); -- jstring js = (jstring) JNIHandles::make_local(env, java_string()); -- bool is_copy; -- HandleMark hm(thread); -- ThreadToNativeFromVM ttn(thread); -- native_platform_string = (_to_platform_string_fn)(env, js, &is_copy); -- assert(is_copy == JNI_TRUE, "is_copy value changed"); -- JNIHandles::destroy_local(js); -- } -- return native_platform_string; --} -- - Handle java_lang_String::char_converter(Handle java_string, jchar from_char, jchar to_char, TRAPS) { - oop obj = java_string(); - // Typical usage is to convert all '/' to '.' in string. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/javaClasses.hpp openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp ---- openjdk6/hotspot/src/share/vm/classfile/javaClasses.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)javaClasses.hpp 1.158 08/01/17 09:41:12 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -99,7 +96,6 @@ - // String converters - static char* as_utf8_string(oop java_string); - static char* as_utf8_string(oop java_string, int start, int len); -- static char* as_platform_dependent_str(Handle java_string, TRAPS); - static jchar* as_unicode_string(oop java_string, int& length); - - static bool equals(oop java_string, jchar* chars, int len); -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/loaderConstraints.cpp openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp ---- openjdk6/hotspot/src/share/vm/classfile/loaderConstraints.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)loaderConstraints.cpp 1.19 07/05/17 15:50:23 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/loaderConstraints.hpp openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp ---- openjdk6/hotspot/src/share/vm/classfile/loaderConstraints.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)loaderConstraints.hpp 1.14 07/05/05 17:05:52 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/placeholders.cpp openjdk/hotspot/src/share/vm/classfile/placeholders.cpp ---- openjdk6/hotspot/src/share/vm/classfile/placeholders.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/placeholders.cpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)placeholders.cpp 1.20 07/05/17 15:50:29 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -270,5 +267,3 @@ - } - } - #endif -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/placeholders.hpp openjdk/hotspot/src/share/vm/classfile/placeholders.hpp ---- openjdk6/hotspot/src/share/vm/classfile/placeholders.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/placeholders.hpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)placeholders.hpp 1.21 07/05/05 17:05:54 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -332,5 +329,3 @@ - void print() const PRODUCT_RETURN; - void verify() const; - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/resolutionErrors.cpp openjdk/hotspot/src/share/vm/classfile/resolutionErrors.cpp ---- openjdk6/hotspot/src/share/vm/classfile/resolutionErrors.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/resolutionErrors.cpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)resolutionErrors.cpp 1.6 07/05/05 17:05:54 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -120,5 +117,3 @@ - } - } - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/resolutionErrors.hpp openjdk/hotspot/src/share/vm/classfile/resolutionErrors.hpp ---- openjdk6/hotspot/src/share/vm/classfile/resolutionErrors.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/resolutionErrors.hpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)resolutionErrors.hpp 1.6 07/05/05 17:05:54 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -100,4 +97,3 @@ - // GC support - void oops_do(OopClosure* blk); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/stackMapFrame.cpp openjdk/hotspot/src/share/vm/classfile/stackMapFrame.cpp ---- openjdk6/hotspot/src/share/vm/classfile/stackMapFrame.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/stackMapFrame.cpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)stackMapFrame.cpp 1.24 07/05/05 17:06:57 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -304,4 +301,3 @@ - } - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/stackMapFrame.hpp openjdk/hotspot/src/share/vm/classfile/stackMapFrame.hpp ---- openjdk6/hotspot/src/share/vm/classfile/stackMapFrame.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/stackMapFrame.hpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)stackMapFrame.hpp 1.20 07/05/05 17:06:57 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -227,4 +224,3 @@ - // Debugging - void print() const PRODUCT_RETURN; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/stackMapTable.cpp openjdk/hotspot/src/share/vm/classfile/stackMapTable.cpp ---- openjdk6/hotspot/src/share/vm/classfile/stackMapTable.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/stackMapTable.cpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)stackMapTable.cpp 1.28 07/05/05 17:06:53 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -428,4 +425,3 @@ - "reserved frame type", CHECK_VERIFY_(pre_frame->verifier(), NULL)); - return NULL; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/stackMapTable.hpp openjdk/hotspot/src/share/vm/classfile/stackMapTable.hpp ---- openjdk6/hotspot/src/share/vm/classfile/stackMapTable.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/stackMapTable.hpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)stackMapTable.hpp 1.21 07/05/05 17:06:57 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp ---- openjdk6/hotspot/src/share/vm/classfile/symbolTable.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)symbolTable.cpp 1.69 07/05/05 17:05:55 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/symbolTable.hpp openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp ---- openjdk6/hotspot/src/share/vm/classfile/symbolTable.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)symbolTable.hpp 1.48 07/05/05 17:05:56 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp ---- openjdk6/hotspot/src/share/vm/classfile/systemDictionary.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)systemDictionary.cpp 1.367 08/01/17 09:41:11 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1245,9 +1242,7 @@ - oop obj = (oop) result.get_jobject(); - if (obj == NULL) { return nk; } - -- Handle h_obj(THREAD, obj); -- char* new_class_name = java_lang_String::as_platform_dependent_str(h_obj, -- CHECK_(nk)); -+ char* new_class_name = java_lang_String::as_utf8_string(obj); - - // lock the loader - // we use this lock because JVMTI does. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/systemDictionary.hpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.hpp ---- openjdk6/hotspot/src/share/vm/classfile/systemDictionary.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.hpp 2008-12-05 16:41:21.837633080 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)systemDictionary.hpp 1.156 07/08/09 09:11:58 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/verificationType.cpp openjdk/hotspot/src/share/vm/classfile/verificationType.cpp ---- openjdk6/hotspot/src/share/vm/classfile/verificationType.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/verificationType.cpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)verificationType.cpp 1.16 07/05/05 17:07:01 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/verificationType.hpp openjdk/hotspot/src/share/vm/classfile/verificationType.hpp ---- openjdk6/hotspot/src/share/vm/classfile/verificationType.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/verificationType.hpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)verificationType.hpp 1.17 07/05/05 17:07:01 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/verifier.cpp openjdk/hotspot/src/share/vm/classfile/verifier.cpp ---- openjdk6/hotspot/src/share/vm/classfile/verifier.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/verifier.cpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)verifier.cpp 1.113 07/05/23 10:53:19 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/verifier.hpp openjdk/hotspot/src/share/vm/classfile/verifier.hpp ---- openjdk6/hotspot/src/share/vm/classfile/verifier.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/verifier.hpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)verifier.hpp 1.41 07/05/05 17:07:02 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/vmSymbols.cpp openjdk/hotspot/src/share/vm/classfile/vmSymbols.cpp ---- openjdk6/hotspot/src/share/vm/classfile/vmSymbols.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.cpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmSymbols.cpp 1.29 07/07/19 19:08:29 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/classfile/vmSymbols.hpp openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp ---- openjdk6/hotspot/src/share/vm/classfile/vmSymbols.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmSymbols.hpp 1.166 07/11/01 16:55:02 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -61,17 +58,12 @@ - template(java_lang_ThreadDeath, "java/lang/ThreadDeath") \ - template(java_lang_Boolean, "java/lang/Boolean") \ - template(java_lang_Character, "java/lang/Character") \ -- template(java_lang_Character_CharacterCache, "java/lang/Character$CharacterCache") \ - template(java_lang_Float, "java/lang/Float") \ - template(java_lang_Double, "java/lang/Double") \ - template(java_lang_Byte, "java/lang/Byte") \ -- template(java_lang_Byte_Cache, "java/lang/Byte$ByteCache") \ - template(java_lang_Short, "java/lang/Short") \ -- template(java_lang_Short_ShortCache, "java/lang/Short$ShortCache") \ - template(java_lang_Integer, "java/lang/Integer") \ -- template(java_lang_Integer_IntegerCache, "java/lang/Integer$IntegerCache") \ - template(java_lang_Long, "java/lang/Long") \ -- template(java_lang_Long_LongCache, "java/lang/Long$LongCache") \ - template(java_lang_Shutdown, "java/lang/Shutdown") \ - template(java_lang_ref_Reference, "java/lang/ref/Reference") \ - template(java_lang_ref_SoftReference, "java/lang/ref/SoftReference") \ -@@ -99,7 +91,6 @@ - template(java_util_Vector, "java/util/Vector") \ - template(java_util_AbstractList, "java/util/AbstractList") \ - template(java_util_Hashtable, "java/util/Hashtable") \ -- template(java_util_HashMap, "java/util/HashMap") \ - template(java_lang_Compiler, "java/lang/Compiler") \ - template(sun_misc_Signal, "sun/misc/Signal") \ - template(java_lang_AssertionStatusDirectives, "java/lang/AssertionStatusDirectives") \ -@@ -283,9 +274,7 @@ - template(exclusive_owner_thread_name, "exclusiveOwnerThread") \ - template(park_blocker_name, "parkBlocker") \ - template(park_event_name, "nativeParkEventPointer") \ -- template(cache_field_name, "cache") \ - template(value_name, "value") \ -- template(frontCacheEnabled_name, "frontCacheEnabled") \ - \ - /* non-intrinsic name/signature pairs: */ \ - template(register_method_name, "register") \ -diff -ruNb openjdk6/hotspot/src/share/vm/code/codeBlob.cpp openjdk/hotspot/src/share/vm/code/codeBlob.cpp ---- openjdk6/hotspot/src/share/vm/code/codeBlob.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/codeBlob.cpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)codeBlob.cpp 1.128 07/05/05 17:05:19 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/codeBlob.hpp openjdk/hotspot/src/share/vm/code/codeBlob.hpp ---- openjdk6/hotspot/src/share/vm/code/codeBlob.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/codeBlob.hpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)codeBlob.hpp 1.125 07/05/05 17:05:18 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/codeCache.cpp openjdk/hotspot/src/share/vm/code/codeCache.cpp ---- openjdk6/hotspot/src/share/vm/code/codeCache.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)codeCache.cpp 1.133 07/09/01 18:01:02 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/codeCache.hpp openjdk/hotspot/src/share/vm/code/codeCache.hpp ---- openjdk6/hotspot/src/share/vm/code/codeCache.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/codeCache.hpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)codeCache.hpp 1.68 07/09/01 18:01:02 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/compiledIC.cpp openjdk/hotspot/src/share/vm/code/compiledIC.cpp ---- openjdk6/hotspot/src/share/vm/code/compiledIC.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/compiledIC.cpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compiledIC.cpp 1.157 07/05/05 17:05:18 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/compiledIC.hpp openjdk/hotspot/src/share/vm/code/compiledIC.hpp ---- openjdk6/hotspot/src/share/vm/code/compiledIC.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/compiledIC.hpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compiledIC.hpp 1.52 07/05/05 17:05:19 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -242,5 +239,3 @@ - inline CompiledStaticCall* compiledStaticCall_at(Relocation* call_site) { - return compiledStaticCall_at(call_site->addr()); - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/compressedStream.cpp openjdk/hotspot/src/share/vm/code/compressedStream.cpp ---- openjdk6/hotspot/src/share/vm/code/compressedStream.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/compressedStream.cpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compressedStream.cpp 1.27 07/05/05 17:05:20 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/compressedStream.hpp openjdk/hotspot/src/share/vm/code/compressedStream.hpp ---- openjdk6/hotspot/src/share/vm/code/compressedStream.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/compressedStream.hpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compressedStream.hpp 1.27 07/05/05 17:05:20 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/debugInfo.cpp openjdk/hotspot/src/share/vm/code/debugInfo.cpp ---- openjdk6/hotspot/src/share/vm/code/debugInfo.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/debugInfo.cpp 2008-12-05 16:41:21.847633231 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)debugInfo.cpp 1.35 07/07/27 16:12:09 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -253,4 +250,3 @@ - } - } - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/debugInfo.hpp openjdk/hotspot/src/share/vm/code/debugInfo.hpp ---- openjdk6/hotspot/src/share/vm/code/debugInfo.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/debugInfo.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)debugInfo.hpp 1.35 07/07/27 16:10:59 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -273,4 +270,3 @@ - void write_handle(jobject h); - void write_bci(int bci) { write_int(bci - InvocationEntryBci); } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/debugInfoRec.cpp openjdk/hotspot/src/share/vm/code/debugInfoRec.cpp ---- openjdk6/hotspot/src/share/vm/code/debugInfoRec.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/debugInfoRec.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)debugInfoRec.cpp 1.55 07/05/24 14:38:33 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/debugInfoRec.hpp openjdk/hotspot/src/share/vm/code/debugInfoRec.hpp ---- openjdk6/hotspot/src/share/vm/code/debugInfoRec.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/debugInfoRec.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)debugInfoRec.hpp 1.38 07/05/24 14:38:33 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -183,4 +180,3 @@ - public: - enum { serialized_null = 0 }; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/dependencies.cpp openjdk/hotspot/src/share/vm/code/dependencies.cpp ---- openjdk6/hotspot/src/share/vm/code/dependencies.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/dependencies.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dependencies.cpp 1.18 08/02/29 12:46:18 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -885,14 +882,6 @@ - // Must not move the class hierarchy during this check: - assert_locked_or_safepoint(Compile_lock); - -- int nof_impls = instanceKlass::cast(context_type)->nof_implementors(); -- if (nof_impls > 1) { -- // Avoid this case: *I.m > { A.m, C }; B.m > C -- // %%% Until this is fixed more systematically, bail out. -- // See corresponding comment in find_witness_anywhere. -- return context_type; -- } -- - assert(!is_participant(new_type), "only old classes are participants"); - if (participants_hide_witnesses) { - // If the new type is a subtype of a participant, we are done. -diff -ruNb openjdk6/hotspot/src/share/vm/code/dependencies.hpp openjdk/hotspot/src/share/vm/code/dependencies.hpp ---- openjdk6/hotspot/src/share/vm/code/dependencies.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/dependencies.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)dependencies.hpp 1.12 07/09/01 18:01:02 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/exceptionHandlerTable.cpp openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp ---- openjdk6/hotspot/src/share/vm/code/exceptionHandlerTable.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)exceptionHandlerTable.cpp 1.33 07/05/05 17:05:20 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/exceptionHandlerTable.hpp openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp ---- openjdk6/hotspot/src/share/vm/code/exceptionHandlerTable.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)exceptionHandlerTable.hpp 1.30 07/05/05 17:05:21 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/icBuffer.cpp openjdk/hotspot/src/share/vm/code/icBuffer.cpp ---- openjdk6/hotspot/src/share/vm/code/icBuffer.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/icBuffer.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)icBuffer.cpp 1.70 07/05/05 17:05:21 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -187,6 +184,3 @@ - ICStub* stub = ICStub_from_destination_address(ic->stub_address()); - return stub->cached_oop(); - } -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/icBuffer.hpp openjdk/hotspot/src/share/vm/code/icBuffer.hpp ---- openjdk6/hotspot/src/share/vm/code/icBuffer.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/icBuffer.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)icBuffer.hpp 1.30 07/05/05 17:05:21 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/location.cpp openjdk/hotspot/src/share/vm/code/location.cpp ---- openjdk6/hotspot/src/share/vm/code/location.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/location.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)location.cpp 1.40 07/05/05 17:05:21 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -70,4 +67,3 @@ - if ((offset_in_bytes % BytesPerInt) != 0) return false; - return (offset_in_bytes / BytesPerInt) < (OFFSET_MASK >> OFFSET_SHIFT); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/location.hpp openjdk/hotspot/src/share/vm/code/location.hpp ---- openjdk6/hotspot/src/share/vm/code/location.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/location.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)location.hpp 1.47 07/05/05 17:05:21 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/nmethod.cpp openjdk/hotspot/src/share/vm/code/nmethod.cpp ---- openjdk6/hotspot/src/share/vm/code/nmethod.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)nmethod.cpp 1.371 08/02/29 12:46:11 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1974,7 +1971,7 @@ - if (ctxk != NULL) { - Klass* k = Klass::cast(ctxk); - if (k->oop_is_instance() && ((instanceKlass*)k)->is_dependent_nmethod(this)) { -- tty->print_cr(" [nmethod<=klass]%s", k->external_name()); -+ tty->print(" [nmethod<=klass]%s", k->external_name()); - } - } - deps.log_dependency(); // put it into the xml log also -diff -ruNb openjdk6/hotspot/src/share/vm/code/nmethod.hpp openjdk/hotspot/src/share/vm/code/nmethod.hpp ---- openjdk6/hotspot/src/share/vm/code/nmethod.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/nmethod.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)nmethod.hpp 1.171 07/09/01 18:01:02 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -579,5 +576,3 @@ - lock_nmethod(_nm); - } - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/oopRecorder.cpp openjdk/hotspot/src/share/vm/code/oopRecorder.cpp ---- openjdk6/hotspot/src/share/vm/code/oopRecorder.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/oopRecorder.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)oopRecorder.cpp 1.22 07/05/05 17:05:22 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -157,5 +154,3 @@ - } - return -1; - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/oopRecorder.hpp openjdk/hotspot/src/share/vm/code/oopRecorder.hpp ---- openjdk6/hotspot/src/share/vm/code/oopRecorder.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/oopRecorder.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oopRecorder.hpp 1.22 07/05/05 17:05:21 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/pcDesc.cpp openjdk/hotspot/src/share/vm/code/pcDesc.cpp ---- openjdk6/hotspot/src/share/vm/code/pcDesc.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/pcDesc.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)pcDesc.cpp 1.31 07/05/24 14:38:34 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -62,4 +59,3 @@ - //Unimplemented(); - return true; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/pcDesc.hpp openjdk/hotspot/src/share/vm/code/pcDesc.hpp ---- openjdk6/hotspot/src/share/vm/code/pcDesc.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/pcDesc.hpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)pcDesc.hpp 1.37 07/05/24 14:38:34 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -62,4 +59,3 @@ - void print(nmethod* code); - bool verify(nmethod* code); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/relocInfo.cpp openjdk/hotspot/src/share/vm/code/relocInfo.cpp ---- openjdk6/hotspot/src/share/vm/code/relocInfo.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/relocInfo.cpp 2008-12-05 16:41:21.857633382 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)relocInfo.cpp 1.89 07/05/05 17:05:21 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/relocInfo.hpp openjdk/hotspot/src/share/vm/code/relocInfo.hpp ---- openjdk6/hotspot/src/share/vm/code/relocInfo.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/relocInfo.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)relocInfo.hpp 1.87 07/06/19 09:08:11 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1329,4 +1326,3 @@ - - ~PatchingRelocIterator() { postpass(); } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/scopeDesc.cpp openjdk/hotspot/src/share/vm/code/scopeDesc.cpp ---- openjdk6/hotspot/src/share/vm/code/scopeDesc.cpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/scopeDesc.cpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)scopeDesc.cpp 1.58 07/07/27 16:13:17 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/scopeDesc.hpp openjdk/hotspot/src/share/vm/code/scopeDesc.hpp ---- openjdk6/hotspot/src/share/vm/code/scopeDesc.hpp 2008-11-25 10:12:05.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/scopeDesc.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)scopeDesc.hpp 1.37 07/05/24 14:38:34 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -124,6 +121,3 @@ - void print_value_on(outputStream* st) const; - #endif - }; -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/stubs.cpp openjdk/hotspot/src/share/vm/code/stubs.cpp ---- openjdk6/hotspot/src/share/vm/code/stubs.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/stubs.cpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)stubs.cpp 1.47 07/05/05 17:05:20 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/stubs.hpp openjdk/hotspot/src/share/vm/code/stubs.hpp ---- openjdk6/hotspot/src/share/vm/code/stubs.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/stubs.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)stubs.hpp 1.34 07/05/05 17:05:22 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -209,6 +206,3 @@ - void verify(); // verifies the stub queue - void print(); // prints information about the stub queue - }; -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/vmreg.cpp openjdk/hotspot/src/share/vm/code/vmreg.cpp ---- openjdk6/hotspot/src/share/vm/code/vmreg.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/vmreg.cpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmreg.cpp 1.35 07/05/05 17:05:22 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/vmreg.hpp openjdk/hotspot/src/share/vm/code/vmreg.hpp ---- openjdk6/hotspot/src/share/vm/code/vmreg.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/vmreg.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmreg.hpp 1.37 07/05/05 17:05:22 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/code/vtableStubs.cpp openjdk/hotspot/src/share/vm/code/vtableStubs.cpp ---- openjdk6/hotspot/src/share/vm/code/vtableStubs.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/vtableStubs.cpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vtableStubs.cpp 1.55 07/05/05 17:05:22 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -198,8 +195,3 @@ - } - - #endif // Product -- -- -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/code/vtableStubs.hpp openjdk/hotspot/src/share/vm/code/vtableStubs.hpp ---- openjdk6/hotspot/src/share/vm/code/vtableStubs.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/code/vtableStubs.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vtableStubs.hpp 1.27 07/05/05 17:05:22 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/abstractCompiler.cpp openjdk/hotspot/src/share/vm/compiler/abstractCompiler.cpp ---- openjdk6/hotspot/src/share/vm/compiler/abstractCompiler.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.cpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)abstractCompiler.cpp 1.4 07/05/05 17:05:23 JVM" --#endif - // - // Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/abstractCompiler.hpp openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp ---- openjdk6/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)abstractCompiler.hpp 1.26 07/05/05 17:05:24 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compileBroker.cpp openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp ---- openjdk6/hotspot/src/share/vm/compiler/compileBroker.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compileBroker.cpp 1.147 07/05/17 15:50:51 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compileBroker.hpp openjdk/hotspot/src/share/vm/compiler/compileBroker.hpp ---- openjdk6/hotspot/src/share/vm/compiler/compileBroker.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compileBroker.hpp 1.55 07/05/05 17:05:24 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compileLog.cpp openjdk/hotspot/src/share/vm/compiler/compileLog.cpp ---- openjdk6/hotspot/src/share/vm/compiler/compileLog.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/compileLog.cpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compileLog.cpp 1.20 07/05/05 17:05:23 JVM" --#endif - /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -295,4 +292,3 @@ - char buf[4 * K]; - finish_log_on_error(file, buf, sizeof(buf)); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compileLog.hpp openjdk/hotspot/src/share/vm/compiler/compileLog.hpp ---- openjdk6/hotspot/src/share/vm/compiler/compileLog.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/compileLog.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compileLog.hpp 1.12 07/05/05 17:05:24 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compilerOracle.cpp openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp ---- openjdk6/hotspot/src/share/vm/compiler/compilerOracle.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compilerOracle.cpp 1.35 07/09/13 11:29:49 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -711,5 +708,3 @@ - line = *line == '\0' ? line : line + 1; - } - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compilerOracle.hpp openjdk/hotspot/src/share/vm/compiler/compilerOracle.hpp ---- openjdk6/hotspot/src/share/vm/compiler/compilerOracle.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compilerOracle.hpp 1.21 07/05/05 17:05:23 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/disassemblerEnv.hpp openjdk/hotspot/src/share/vm/compiler/disassemblerEnv.hpp ---- openjdk6/hotspot/src/share/vm/compiler/disassemblerEnv.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/disassemblerEnv.hpp 2008-12-05 16:41:21.867633533 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)disassemblerEnv.hpp 1.18 07/05/05 17:05:24 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -36,4 +33,3 @@ - virtual char* string_for_offset(intptr_t value) = 0; - virtual char* string_for_constant(unsigned char* pc, intptr_t value, int is_decimal) = 0; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/methodLiveness.cpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp ---- openjdk6/hotspot/src/share/vm/compiler/methodLiveness.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)methodLiveness.cpp 1.41 07/05/05 17:05:24 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1064,4 +1061,3 @@ - } - - #endif // PRODUCT -- -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/methodLiveness.hpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.hpp ---- openjdk6/hotspot/src/share/vm/compiler/methodLiveness.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)methodLiveness.hpp 1.25 07/05/05 17:05:24 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/oopMap.cpp openjdk/hotspot/src/share/vm/compiler/oopMap.cpp ---- openjdk6/hotspot/src/share/vm/compiler/oopMap.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)oopMap.cpp 1.153 07/09/28 10:23:20 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/compiler/oopMap.hpp openjdk/hotspot/src/share/vm/compiler/oopMap.hpp ---- openjdk6/hotspot/src/share/vm/compiler/oopMap.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/oopMap.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oopMap.hpp 1.81 07/09/28 10:23:19 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)binaryTreeDictionary.cpp 1.37 07/05/05 17:05:43 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)binaryTreeDictionary.hpp 1.27 08/04/09 19:19:11 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -133,7 +130,6 @@ - const size_t MIN_TREE_CHUNK_SIZE = sizeof(TreeChunk)/HeapWordSize; - - class BinaryTreeDictionary: public FreeBlockDictionary { -- friend class VMStructs; - bool _splay; - size_t _totalSize; - size_t _totalFreeBlocks; -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cmsAdaptiveSizePolicy.cpp 1.19 07/05/05 17:05:24 JVM" --#endif - /* - * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cmsAdaptiveSizePolicy.hpp 1.16 07/05/05 17:05:25 JVM" --#endif - /* - * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cmsCollectorPolicy.cpp 1.1 07/05/16 10:53:57 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cmsCollectorPolicy.hpp 1.1 07/05/16 10:53:57 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cmsGCAdaptivePolicyCounters.cpp 1.16 07/05/05 17:05:25 JVM" --#endif - /* - * Copyright 2004-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cmsGCAdaptivePolicyCounters.hpp 1.16 07/05/05 17:05:25 JVM" --#endif - /* - * Copyright 2004-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cmsLockVerifier.cpp 1.14 07/05/05 17:05:44 JVM" --#endif - /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -96,4 +93,3 @@ - } - } - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cmsLockVerifier.hpp 1.9 07/05/05 17:05:44 JVM" --#endif - /* - * Copyright 2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,8 +1,5 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cmsOopClosures.hpp 1.4 08/09/25 13:46:14 JVM" --#endif - /* -- * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -286,7 +283,7 @@ - // processing phase of the CMS final checkpoint step. - class CMSKeepAliveClosure: public OopClosure { - CMSCollector* _collector; -- const MemRegion _span; -+ MemRegion _span; - CMSMarkStack* _mark_stack; - CMSBitMap* _bit_map; - public: -@@ -295,9 +292,7 @@ - _collector(collector), - _span(span), - _bit_map(bit_map), -- _mark_stack(mark_stack) { -- assert(!_span.is_empty(), "Empty span could spell trouble"); -- } -+ _mark_stack(mark_stack) { } - - void do_oop(oop* p); - void do_oop_nv(oop* p) { CMSKeepAliveClosure::do_oop(p); } -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cmsOopClosures.inline.hpp 1.1 07/05/16 10:52:51 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cmsPermGen.cpp 1.2 07/05/16 16:53:01 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp 2008-12-05 16:41:21.877633684 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cmsPermGen.hpp 1.1 07/05/02 16:12:51 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2008-12-05 16:41:21.887633834 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compactibleFreeListSpace.cpp 1.144 08/09/06 09:20:55 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -2797,12 +2794,10 @@ - assert(n_threads > 0, "Unexpected n_threads argument"); - const size_t task_size = rescan_task_size(); - size_t n_tasks = (used_region().word_size() + task_size - 1)/task_size; -- assert((n_tasks == 0) == used_region().is_empty(), "n_tasks incorrect"); -- assert(n_tasks == 0 || -- ((used_region().start() + (n_tasks - 1)*task_size < used_region().end()) && -- (used_region().start() + n_tasks*task_size >= used_region().end())), -- "n_tasks calculation incorrect"); -- -+ assert((used_region().start() + (n_tasks - 1)*task_size < -+ used_region().end()) && -+ (used_region().start() + n_tasks*task_size >= -+ used_region().end()), "n_task calculation incorrect"); - SequentialSubTasksDone* pst = conc_par_seq_tasks(); - assert(!pst->valid(), "Clobbering existing data?"); - pst->set_par_threads(n_threads); -@@ -2842,10 +2837,9 @@ - assert(n_tasks == 0 || - ((span.start() + (n_tasks - 1)*task_size < span.end()) && - (span.start() + n_tasks*task_size >= span.end())), -- "n_tasks calculation incorrect"); -+ "n_task calculation incorrect"); - SequentialSubTasksDone* pst = conc_par_seq_tasks(); - assert(!pst->valid(), "Clobbering existing data?"); - pst->set_par_threads(n_threads); - pst->set_n_tasks((int)n_tasks); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp 2008-12-05 16:41:21.887633834 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compactibleFreeListSpace.hpp 1.91 07/05/05 17:05:45 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2008-12-05 16:41:21.887633834 +0100 -@@ -1,8 +1,5 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)concurrentMarkSweepGeneration.cpp 1.293 08/10/30 20:45:16 JVM" --#endif - /* -- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -495,10 +492,7 @@ - -1 /* lock-free */, "No_lock" /* dummy */), - _modUnionClosure(&_modUnionTable), - _modUnionClosurePar(&_modUnionTable), -- // Adjust my span to cover old (cms) gen and perm gen -- _span(cmsGen->reserved()._union(permGen->reserved())), -- // Construct the is_alive_closure with _span & markBitMap -- _is_alive_closure(_span, &_markBitMap), -+ _is_alive_closure(&_markBitMap), - _restart_addr(NULL), - _overflow_list(NULL), - _preserved_oop_stack(NULL), -@@ -550,6 +544,11 @@ - _cmsGen->cmsSpace()->set_collector(this); - _permGen->cmsSpace()->set_collector(this); - -+ // Adjust my span to cover old (cms) gen and perm gen -+ _span = _cmsGen->reserved()._union(_permGen->reserved()); -+ // Initialize the span of is_alive_closure -+ _is_alive_closure.set_span(_span); -+ - // Allocate MUT and marking bit map - { - MutexLockerEx x(_markBitMap.lock(), Mutex::_no_safepoint_check_flag); -@@ -3122,7 +3121,12 @@ - if (GCExpandToAllocateDelayMillis > 0) { - os::sleep(Thread::current(), GCExpandToAllocateDelayMillis, false); - } -- return have_lock_and_allocate(word_size, tlab); -+ size_t adj_word_sz = CompactibleFreeListSpace::adjustObjectSize(word_size); -+ if (parallel) { -+ return cmsSpace()->par_allocate(adj_word_sz); -+ } else { -+ return cmsSpace()->allocate(adj_word_sz); -+ } - } - - // YSR: All of this generation expansion/shrinking stuff is an exact copy of -@@ -3598,7 +3602,6 @@ - CompactibleFreeListSpace* _cms_space; - CompactibleFreeListSpace* _perm_space; - HeapWord* _global_finger; -- HeapWord* _restart_addr; - - // Exposed here for yielding support - Mutex* const _bit_map_lock; -@@ -3629,7 +3632,7 @@ - _term.set_task(this); - assert(_cms_space->bottom() < _perm_space->bottom(), - "Finger incorrectly initialized below"); -- _restart_addr = _global_finger = _cms_space->bottom(); -+ _global_finger = _cms_space->bottom(); - } - - -@@ -3647,10 +3650,6 @@ - bool result() { return _result; } - - void reset(HeapWord* ra) { -- assert(_global_finger >= _cms_space->end(), "Postcondition of ::work(i)"); -- assert(_global_finger >= _perm_space->end(), "Postcondition of ::work(i)"); -- assert(ra < _perm_space->end(), "ra too large"); -- _restart_addr = _global_finger = ra; - _term.reset_for_reuse(); - } - -@@ -3795,24 +3794,16 @@ - int n_tasks = pst->n_tasks(); - // We allow that there may be no tasks to do here because - // we are restarting after a stack overflow. -- assert(pst->valid() || n_tasks == 0, "Uninitialized use?"); -+ assert(pst->valid() || n_tasks == 0, "Uninitializd use?"); - int nth_task = 0; - -- HeapWord* aligned_start = sp->bottom(); -- if (sp->used_region().contains(_restart_addr)) { -- // Align down to a card boundary for the start of 0th task -- // for this space. -- aligned_start = -- (HeapWord*)align_size_down((uintptr_t)_restart_addr, -- CardTableModRefBS::card_size); -- } -- -+ HeapWord* start = sp->bottom(); - size_t chunk_size = sp->marking_task_size(); - while (!pst->is_task_claimed(/* reference */ nth_task)) { - // Having claimed the nth task in this space, - // compute the chunk that it corresponds to: -- MemRegion span = MemRegion(aligned_start + nth_task*chunk_size, -- aligned_start + (nth_task+1)*chunk_size); -+ MemRegion span = MemRegion(start + nth_task*chunk_size, -+ start + (nth_task+1)*chunk_size); - // Try and bump the global finger via a CAS; - // note that we need to do the global finger bump - // _before_ taking the intersection below, because -@@ -3827,19 +3818,6 @@ - // beyond the "top" address of the space. - span = span.intersection(sp->used_region()); - if (!span.is_empty()) { // Non-null task -- HeapWord* prev_obj; -- assert(!span.contains(_restart_addr) || nth_task == 0, -- "Inconsistency"); -- if (nth_task == 0) { -- // For the 0th task, we'll not need to compute a block_start. -- if (span.contains(_restart_addr)) { -- // In the case of a restart because of stack overflow, -- // we might additionally skip a chunk prefix. -- prev_obj = _restart_addr; -- } else { -- prev_obj = span.start(); -- } -- } else { - // We want to skip the first object because - // the protocol is to scan any object in its entirety - // that _starts_ in this span; a fortiori, any -@@ -3847,7 +3825,7 @@ - // as part of an earlier claimed task. - // Below we use the "careful" version of block_start - // so we do not try to navigate uninitialized objects. -- prev_obj = sp->block_start_careful(span.start()); -+ HeapWord* prev_obj = sp->block_start_careful(span.start()); - // Below we use a variant of block_size that uses the - // Printezis bits to avoid waiting for allocated - // objects to become initialized/parsable. -@@ -3862,7 +3840,6 @@ - break; - } - } -- } - if (prev_obj < span.end()) { - MemRegion my_span = MemRegion(prev_obj, span.end()); - // Do the marking work within a non-empty span -- -@@ -3911,15 +3888,13 @@ - void handle_stack_overflow(HeapWord* lost); - }; - --// Grey object scanning during work stealing phase -- --// the salient assumption here is that any references --// that are in these stolen objects being scanned must --// already have been initialized (else they would not have --// been published), so we do not need to check for --// uninitialized objects before pushing here. -+// Grey object rescan during work stealing phase -- -+// the salient assumption here is that stolen oops must -+// always be initialized, so we do not need to check for -+// uninitialized objects before scanning here. - void Par_ConcMarkingClosure::do_oop(oop* p) { - oop this_oop = *p; -- assert(this_oop->is_oop_or_null(true), -+ assert(this_oop->is_oop_or_null(), - "expected an oop or NULL"); - HeapWord* addr = (HeapWord*)this_oop; - // Check if oop points into the CMS generation -@@ -3975,7 +3950,7 @@ - // in CMSCollector's _restart_address. - void Par_ConcMarkingClosure::handle_stack_overflow(HeapWord* lost) { - // We need to do this under a mutex to prevent other -- // workers from interfering with the work done below. -+ // workers from interfering with the expansion below. - MutexLockerEx ml(_overflow_stack->par_lock(), - Mutex::_no_safepoint_check_flag); - // Remember the least grey address discarded -@@ -5463,7 +5438,7 @@ - typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask; - CMSCollector* _collector; - CMSBitMap* _mark_bit_map; -- const MemRegion _span; -+ MemRegion _span; - OopTaskQueueSet* _task_queues; - ParallelTaskTerminator _term; - ProcessTask& _task; -@@ -5480,10 +5455,8 @@ - _collector(collector), _span(span), _mark_bit_map(mark_bit_map), - _task_queues(task_queues), - _term(total_workers, task_queues) -- { -- assert(_collector->_span.equals(_span) && !_span.is_empty(), -- "Inconsistency in _span"); -- } -+ { } -+ - OopTaskQueueSet* task_queues() { return _task_queues; } - - OopTaskQueue* work_queue(int i) { return task_queues()->queue(i); } -@@ -5499,12 +5472,11 @@ - }; - - void CMSRefProcTaskProxy::work(int i) { -- assert(_collector->_span.equals(_span), "Inconsistency in _span"); - CMSParKeepAliveClosure par_keep_alive(_collector, _span, - _mark_bit_map, work_queue(i)); - CMSParDrainMarkingStackClosure par_drain_stack(_collector, _span, - _mark_bit_map, work_queue(i)); -- CMSIsAliveClosure is_alive_closure(_span, _mark_bit_map); -+ CMSIsAliveClosure is_alive_closure(_mark_bit_map); - _task.work(i, is_alive_closure, par_keep_alive, par_drain_stack); - if (_task.marks_oops_alive()) { - do_work_steal(i, &par_drain_stack, &par_keep_alive, -@@ -6825,9 +6797,11 @@ - // during the preclean or remark phase. (CMSCleanOnEnter) - if (CMSCleanOnEnter) { - size_t sz = _collector->block_size_using_printezis_bits(addr); -+ HeapWord* start_card_addr = (HeapWord*)round_down( -+ (intptr_t)addr, CardTableModRefBS::card_size); - HeapWord* end_card_addr = (HeapWord*)round_to( - (intptr_t)(addr+sz), CardTableModRefBS::card_size); -- MemRegion redirty_range = MemRegion(addr, end_card_addr); -+ MemRegion redirty_range = MemRegion(start_card_addr, end_card_addr); - assert(!redirty_range.is_empty(), "Arithmetical tautology"); - // Bump _threshold to end_card_addr; note that - // _threshold cannot possibly exceed end_card_addr, anyhow. -@@ -7245,8 +7219,7 @@ - _should_remember_klasses(collector->cms_should_unload_classes()) - { } - --// Assumes thread-safe access by callers, who are --// responsible for mutual exclusion. -+ - void CMSCollector::lower_restart_addr(HeapWord* low) { - assert(_span.contains(low), "Out of bounds addr"); - if (_restart_addr == NULL) { -@@ -7272,7 +7245,7 @@ - // in CMSCollector's _restart_address. - void Par_PushOrMarkClosure::handle_stack_overflow(HeapWord* lost) { - // We need to do this under a mutex to prevent other -- // workers from interfering with the work done below. -+ // workers from interfering with the expansion below. - MutexLockerEx ml(_overflow_stack->par_lock(), - Mutex::_no_safepoint_check_flag); - // Remember the least grey address discarded -@@ -7419,25 +7392,12 @@ - ) - if (simulate_overflow || !_mark_stack->push(this_oop)) { - if (_concurrent_precleaning) { -- // During precleaning we can just dirty the appropriate card(s) -+ // During precleaning we can just dirty the appropriate card - // in the mod union table, thus ensuring that the object remains -- // in the grey set and continue. In the case of object arrays -- // we need to dirty all of the cards that the object spans, -- // since the rescan of object arrays will be limited to the -- // dirty cards. -- // Note that no one can be intefering with us in this action -- // of dirtying the mod union table, so no locking or atomics -- // are required. -- if (this_oop->is_objArray()) { -- size_t sz = this_oop->size(); -- HeapWord* end_card_addr = (HeapWord*)round_to( -- (intptr_t)(addr+sz), CardTableModRefBS::card_size); -- MemRegion redirty_range = MemRegion(addr, end_card_addr); -- assert(!redirty_range.is_empty(), "Arithmetical tautology"); -- _mod_union_table->mark_range(redirty_range); -- } else { -+ // in the grey set and continue. Note that no one can be intefering -+ // with us in this action of dirtying the mod union table, so -+ // no locking is required. - _mod_union_table->mark(addr); -- } - _collector->_ser_pmc_preclean_ovflw++; - } else { - // During the remark phase, we need to remember this oop -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2008-12-05 16:41:21.887633834 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)concurrentMarkSweepGeneration.hpp 1.163 08/09/25 13:47:54 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -438,18 +435,20 @@ - // if the object is "live" (reachable). Used in weak - // reference processing. - class CMSIsAliveClosure: public BoolObjectClosure { -- const MemRegion _span; -+ MemRegion _span; - const CMSBitMap* _bit_map; - - friend class CMSCollector; -+ protected: -+ void set_span(MemRegion span) { _span = span; } - public: -+ CMSIsAliveClosure(CMSBitMap* bit_map): -+ _bit_map(bit_map) { } -+ - CMSIsAliveClosure(MemRegion span, - CMSBitMap* bit_map): - _span(span), -- _bit_map(bit_map) { -- assert(!span.is_empty(), "Empty span could spell trouble"); -- } -- -+ _bit_map(bit_map) { } - void do_object(oop obj) { - assert(false, "not to be invoked"); - } -@@ -598,7 +597,7 @@ - // ("Weak") Reference processing support - ReferenceProcessor* _ref_processor; - CMSIsAliveClosure _is_alive_closure; -- // keep this textually after _markBitMap and _span; c'tor dependency -+ // keep this textually after _markBitMap; c'tor dependency - - ConcurrentMarkSweepThread* _cmsThread; // the thread doing the work - ModUnionClosure _modUnionClosure; -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp 2008-12-05 16:41:21.887633834 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)concurrentMarkSweepGeneration.inline.hpp 1.47 07/05/17 15:52:12 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)concurrentMarkSweepThread.cpp 1.48 07/05/05 17:06:45 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)concurrentMarkSweepThread.hpp 1.38 07/05/05 17:06:46 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)freeBlockDictionary.cpp 1.12 07/05/05 17:05:47 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)freeBlockDictionary.hpp 1.32 07/05/05 17:05:47 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)freeChunk.cpp 1.16 07/05/05 17:05:47 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)freeList.cpp 1.31 07/05/05 17:05:48 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)freeList.hpp 1.32 08/04/09 19:18:54 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -41,7 +38,6 @@ - - class FreeList VALUE_OBJ_CLASS_SPEC { - friend class CompactibleFreeListSpace; -- friend class VMStructs; - FreeChunk* _head; // List of free chunks - FreeChunk* _tail; // Tail of list of free chunks - size_t _size; // Size in Heap words of each chunks -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmCMSOperations.cpp 1.16 07/05/29 09:44:13 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -251,4 +248,3 @@ - // Enable iCMS back. - CMSCollector::enable_icms(); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmCMSOperations.hpp 1.13 07/05/29 09:44:13 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmStructs_cms.hpp 1.3 08/04/09 19:18:31 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -41,15 +38,7 @@ - static_field(ConcurrentMarkSweepThread, _collector, CMSCollector*) \ - nonstatic_field(FreeChunk, _next, FreeChunk*) \ - nonstatic_field(FreeChunk, _prev, FreeChunk*) \ -- nonstatic_field(FreeChunk, _size, size_t) \ -- nonstatic_field(LinearAllocBlock, _word_size, size_t) \ -- nonstatic_field(FreeList, _size, size_t) \ -- nonstatic_field(FreeList, _count, ssize_t) \ -- nonstatic_field(BinaryTreeDictionary, _totalSize, size_t) \ -- nonstatic_field(CompactibleFreeListSpace, _dictionary, FreeBlockDictionary*) \ -- nonstatic_field(CompactibleFreeListSpace, _indexedFreeList[0], FreeList) \ -- nonstatic_field(CompactibleFreeListSpace, _smallLinearAllocBlock, LinearAllocBlock) -- -+ nonstatic_field(FreeChunk, _size, size_t) - - #define VM_TYPES_CMS(declare_type, \ - declare_toplevel_type) \ -@@ -68,14 +57,7 @@ - declare_toplevel_type(SurrogateLockerThread*) \ - declare_toplevel_type(CompactibleFreeListSpace*) \ - declare_toplevel_type(CMSCollector*) \ -- declare_toplevel_type(FreeChunk*) \ -- declare_toplevel_type(BinaryTreeDictionary*) \ -- declare_toplevel_type(FreeBlockDictionary*) \ -- declare_toplevel_type(FreeList*) \ -- declare_toplevel_type(FreeList) \ -- declare_toplevel_type(LinearAllocBlock) \ -- declare_toplevel_type(FreeBlockDictionary) \ -- declare_type(BinaryTreeDictionary, FreeBlockDictionary) -+ declare_toplevel_type(FreeChunk*) - - #define VM_INT_CONSTANTS_CMS(declare_constant) \ - declare_constant(Generation::ConcurrentMarkSweep) \ -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)asParNewGeneration.cpp 1.11 07/05/05 17:05:25 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)asParNewGeneration.hpp 1.8 07/05/05 17:05:25 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parCardTableModRefBS.cpp 1.1 07/05/16 19:06:21 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp 2008-12-05 16:41:21.897633985 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parGCAllocBuffer.cpp 1.28 07/05/29 09:44:12 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parGCAllocBuffer.hpp 1.30 07/05/29 09:44:13 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parNewGeneration.cpp 1.102 07/09/07 09:50:43 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parNewGeneration.hpp 1.48 07/05/17 15:52:44 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parOopClosures.hpp 1.2 07/06/22 16:49:48 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parOopClosures.inline.hpp 1.1 07/05/16 10:51:44 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -100,4 +97,3 @@ - } - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)adjoiningGenerations.cpp 1.16 07/05/05 17:05:26 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -279,4 +276,3 @@ - } - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)adjoiningGenerations.hpp 1.14 07/05/05 17:05:25 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)adjoiningVirtualSpaces.cpp 1.14 07/05/05 17:05:26 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)adjoiningVirtualSpaces.hpp 1.11 07/05/05 17:05:25 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -109,4 +106,3 @@ - size_t init_low_byte_size, - size_t init_high_byte_size); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)asPSOldGen.cpp 1.20 07/10/04 10:49:35 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)asPSOldGen.hpp 1.14 07/05/05 17:05:26 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)asPSYoungGen.cpp 1.24 07/10/04 10:49:36 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)asPSYoungGen.hpp 1.16 07/05/05 17:05:26 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cardTableExtension.cpp 1.35 07/09/25 16:47:41 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -780,4 +777,3 @@ - } - return min_start; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cardTableExtension.hpp 1.20 07/05/05 17:05:26 JVM" --#endif - /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -109,4 +106,3 @@ - - #endif // ASSERT - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcTaskManager.cpp 1.35 07/06/29 04:07:55 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gcTaskManager.hpp 1.29 07/06/29 04:08:20 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp 2008-12-05 16:41:21.907634136 +0100 -@@ -1,7 +1,4 @@ - --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcTaskThread.cpp 1.25 07/05/05 17:05:26 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -151,4 +148,3 @@ - } - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gcTaskThread.hpp 1.18 07/05/05 17:05:27 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)generationSizer.hpp 1.17 07/05/05 17:05:27 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -70,5 +67,3 @@ - size_t perm_gen_size() { return PermSize; } - size_t max_perm_gen_size() { return MaxPermSize; } - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)objectStartArray.cpp 1.20 07/05/05 17:05:28 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)objectStartArray.hpp 1.21 07/05/05 17:05:28 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -163,4 +160,3 @@ - // "start", the method will return true. - bool object_starts_in_range(HeapWord* start_addr, HeapWord* end_addr) const; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parMarkBitMap.cpp 1.31 07/10/04 10:49:33 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parMarkBitMap.hpp 1.16 07/05/05 17:05:27 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parMarkBitMap.inline.hpp 1.6 07/05/05 17:05:27 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parallelScavengeHeap.cpp 1.95 07/10/04 10:49:31 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parallelScavengeHeap.hpp 1.62 07/10/04 10:49:30 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parallelScavengeHeap.inline.hpp 1.5 07/05/05 17:05:28 JVM" --#endif - /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)pcTasks.cpp 1.22 07/06/22 16:49:49 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -284,4 +281,3 @@ - // Process any chunks already in the compaction managers stacks. - cm->drain_chunk_stacks(); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)pcTasks.hpp 1.19 07/05/05 17:05:26 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)prefetchQueue.hpp 1.13 07/05/05 17:05:28 JVM" --#endif - /* - * Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -68,6 +65,3 @@ - return _prefetch_queue[_prefetch_index]; - } - }; -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psAdaptiveSizePolicy.cpp 1.82 07/10/04 10:49:34 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psAdaptiveSizePolicy.hpp 1.64 07/10/04 10:49:35 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psCompactionManager.cpp 1.17 06/07/10 23:27:02 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp 2008-11-25 10:12:06.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psCompactionManager.hpp 1.17 07/05/05 17:05:29 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psGCAdaptivePolicyCounters.cpp 1.23 07/05/05 17:05:31 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -200,4 +197,3 @@ - update_counters_from_policy(); - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp 2008-12-05 16:41:21.917634287 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psGCAdaptivePolicyCounters.hpp 1.21 07/05/05 17:05:29 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psGenerationCounters.cpp 1.7 07/05/05 17:05:29 JVM" --#endif - - /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psGenerationCounters.hpp 1.8 07/05/05 17:05:29 JVM" --#endif - - /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psMarkSweep.cpp 1.92 07/06/08 23:11:01 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psMarkSweep.hpp 1.26 07/05/05 17:05:28 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -86,4 +83,3 @@ - // Time since last full gc (in milliseconds) - static jlong millis_since_last_gc(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psMarkSweepDecorator.cpp 1.26 07/05/17 15:52:53 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psMarkSweepDecorator.hpp 1.14 07/05/05 17:05:29 JVM" --#endif - /* - * Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -74,7 +71,3 @@ - void precompact(); - void compact(bool mangle_free_space); - }; -- -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psOldGen.cpp 1.54 07/05/05 17:05:28 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psOldGen.hpp 1.37 07/05/05 17:05:30 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psParallelCompact.cpp 1.64 08/06/19 15:33:02 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1030,9 +1027,6 @@ - - DEBUG_ONLY(mark_bitmap()->verify_clear();) - DEBUG_ONLY(summary_data().verify_clear();) -- -- // Have worker threads release resources the next time they run a task. -- gc_task_manager()->release_all_resources(); - } - - void PSParallelCompact::post_compact() -@@ -1978,6 +1972,12 @@ - TimeStamp compaction_start; - TimeStamp collection_exit; - -+ // "serial_CM" is needed until the parallel implementation -+ // of the move and update is done. -+ ParCompactionManager* serial_CM = new ParCompactionManager(); -+ // Don't initialize more than once. -+ // serial_CM->initialize(&summary_data(), mark_bitmap()); -+ - ParallelScavengeHeap* heap = gc_heap(); - GCCause::Cause gc_cause = heap->gc_cause(); - PSYoungGen* young_gen = heap->young_gen(); -@@ -1992,10 +1992,6 @@ - PreGCValues pre_gc_values; - pre_compact(&pre_gc_values); - -- // Get the compaction manager reserved for the VM thread. -- ParCompactionManager* const vmthread_cm = -- ParCompactionManager::manager_array(gc_task_manager()->workers()); -- - // Place after pre_compact() where the number of invocations is incremented. - AdaptiveSizePolicyOutput(size_policy, heap->total_collections()); - -@@ -2035,7 +2031,7 @@ - bool marked_for_unloading = false; - - marking_start.update(); -- marking_phase(vmthread_cm, maximum_heap_compaction); -+ marking_phase(serial_CM, maximum_heap_compaction); - - #ifndef PRODUCT - if (TraceParallelOldGCMarkingPhase) { -@@ -2066,7 +2062,7 @@ - #endif - - bool max_on_system_gc = UseMaximumCompactionOnSystemGC && is_system_gc; -- summary_phase(vmthread_cm, maximum_heap_compaction || max_on_system_gc); -+ summary_phase(serial_CM, maximum_heap_compaction || max_on_system_gc); - - #ifdef ASSERT - if (VerifyParallelOldWithMarkSweep && -@@ -2094,13 +2090,13 @@ - // code can use the the forwarding pointers to - // check the new pointer calculation. The restore_marks() - // has to be done before the real compact. -- vmthread_cm->set_action(ParCompactionManager::VerifyUpdate); -- compact_perm(vmthread_cm); -- compact_serial(vmthread_cm); -- vmthread_cm->set_action(ParCompactionManager::ResetObjects); -- compact_perm(vmthread_cm); -- compact_serial(vmthread_cm); -- vmthread_cm->set_action(ParCompactionManager::UpdateAndCopy); -+ serial_CM->set_action(ParCompactionManager::VerifyUpdate); -+ compact_perm(serial_CM); -+ compact_serial(serial_CM); -+ serial_CM->set_action(ParCompactionManager::ResetObjects); -+ compact_perm(serial_CM); -+ compact_serial(serial_CM); -+ serial_CM->set_action(ParCompactionManager::UpdateAndCopy); - - // For debugging only - PSMarkSweep::restore_marks(); -@@ -2111,14 +2107,16 @@ - compaction_start.update(); - // Does the perm gen always have to be done serially because - // klasses are used in the update of an object? -- compact_perm(vmthread_cm); -+ compact_perm(serial_CM); - - if (UseParallelOldGCCompacting) { - compact(); - } else { -- compact_serial(vmthread_cm); -+ compact_serial(serial_CM); - } - -+ delete serial_CM; -+ - // Reset the mark bitmap, summary data, and do other bookkeeping. Must be - // done before resizing. - post_compact(); -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psParallelCompact.hpp 1.48 07/10/04 10:49:38 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psPermGen.cpp 1.28 07/05/05 17:05:30 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psPermGen.hpp 1.18 07/05/05 17:05:30 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -54,4 +51,3 @@ - - virtual const char* name() const { return "PSPermGen"; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psPromotionLAB.cpp 1.17 07/05/05 17:05:30 JVM" --#endif - /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psPromotionLAB.hpp 1.13 07/05/05 17:05:30 JVM" --#endif - /* - * Copyright 2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -143,5 +140,3 @@ - - debug_only(virtual bool lab_is_valid(MemRegion lab)); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psPromotionManager.cpp 1.30 07/09/25 16:47:41 JVM" --#endif - /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp 2008-12-05 16:41:21.927634438 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psPromotionManager.hpp 1.20 07/09/25 16:47:42 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psPromotionManager.inline.hpp 1.19 07/09/25 16:47:42 JVM" --#endif - /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psScavenge.cpp 1.99 07/09/07 09:53:34 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psScavenge.hpp 1.46 07/05/05 17:05:30 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psScavenge.inline.hpp 1.18 07/05/05 17:05:29 JVM" --#endif - /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psTasks.cpp 1.29 07/09/25 16:47:43 JVM" --#endif - /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -222,5 +219,3 @@ - pm->drain_stacks(false); - } - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psTasks.hpp 1.21 07/05/05 17:05:29 JVM" --#endif - /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -146,4 +143,3 @@ - - virtual void do_it(GCTaskManager* manager, uint which); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psVirtualspace.cpp 1.16 07/05/05 17:05:31 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psVirtualspace.hpp 1.15 07/05/05 17:05:31 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psYoungGen.cpp 1.68 07/10/04 10:49:36 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psYoungGen.hpp 1.48 07/05/05 17:05:31 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmPSOperations.cpp 1.1 07/05/14 11:57:11 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -102,4 +99,3 @@ - } - notify_gc_end(); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmPSOperations.hpp 1.2 07/05/16 16:53:01 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmStructs_parallelgc.hpp 1.2 07/05/01 19:01:30 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)adaptiveSizePolicy.cpp 1.13 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)adaptiveSizePolicy.hpp 1.15 07/05/05 17:05:32 JVM" --#endif - /* - * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ageTable.cpp 1.36 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ageTable.hpp 1.29 07/05/05 17:05:32 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cSpaceCounters.cpp 1.10 07/05/05 17:05:32 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cSpaceCounters.hpp 1.12 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -78,4 +75,3 @@ - return _space->used(); - } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp 2008-12-05 16:41:21.937634589 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)collectorCounters.cpp 1.10 07/05/05 17:05:32 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)collectorCounters.hpp 1.10 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -81,4 +78,3 @@ - if (UsePerfData) _c->last_exit_counter()->set_value(os::elapsed_counter()); - } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gSpaceCounters.cpp 1.11 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gSpaceCounters.hpp 1.14 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -103,4 +100,3 @@ - return _gen->used(); - } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcAdaptivePolicyCounters.cpp 1.10 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2004-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcAdaptivePolicyCounters.hpp 1.11 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2004-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcPolicyCounters.cpp 1.13 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gcPolicyCounters.hpp 1.18 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcStats.cpp 1.9 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gcStats.hpp 1.10 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcUtil.cpp 1.21 07/05/05 17:05:32 JVM" --#endif - /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gcUtil.hpp 1.19 07/05/05 17:05:32 JVM" --#endif - /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -177,4 +174,3 @@ - _timer->start(); - } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)generationCounters.cpp 1.10 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)generationCounters.hpp 1.14 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)immutableSpace.cpp 1.13 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -80,4 +77,3 @@ - } - guarantee(p == end(), "end of last object must match end of space"); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)immutableSpace.hpp 1.14 07/05/05 17:05:33 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)isGCActiveMark.hpp 1.9 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)liveRange.hpp 1.11 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)markSweep.cpp 1.196 07/05/05 17:05:35 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -358,4 +355,3 @@ - } - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)markSweep.hpp 1.67 07/05/17 15:52:55 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)markSweep.inline.hpp 1.17 07/05/29 09:44:12 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)mutableNUMASpace.cpp 1.8 07/05/05 17:05:35 JVM" --#endif - - /* - * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp 2008-12-05 16:41:21.947634739 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)mutableNUMASpace.hpp 1.8 07/05/05 17:05:34 JVM" --#endif - /* - * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)mutableSpace.cpp 1.22 07/05/05 17:05:35 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)mutableSpace.hpp 1.22 07/05/05 17:05:35 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)spaceCounters.cpp 1.10 07/05/05 17:05:35 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)spaceCounters.hpp 1.11 07/05/05 17:05:35 JVM" --#endif - /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmGCOperations.cpp 1.21 07/05/29 09:44:12 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp ---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmGCOperations.hpp 1.14 07/05/29 09:44:12 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.cpp openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.cpp ---- openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)collectedHeap.cpp 1.24 07/07/19 19:08:26 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.hpp openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.hpp ---- openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.hpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)collectedHeap.hpp 1.58 07/09/07 10:56:50 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp ---- openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)collectedHeap.inline.hpp 1.50 07/09/07 10:56:50 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/gcCause.cpp openjdk/hotspot/src/share/vm/gc_interface/gcCause.cpp ---- openjdk6/hotspot/src/share/vm/gc_interface/gcCause.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_interface/gcCause.cpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcCause.cpp 1.20 07/05/05 17:05:40 JVM" --#endif - /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/gcCause.hpp openjdk/hotspot/src/share/vm/gc_interface/gcCause.hpp ---- openjdk6/hotspot/src/share/vm/gc_interface/gcCause.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_interface/gcCause.hpp 2008-12-05 16:41:21.957634890 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gcCause.hpp 1.24 07/05/05 17:05:40 JVM" --#endif - /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/includeDB_core openjdk/hotspot/src/share/vm/includeDB_core ---- openjdk6/hotspot/src/share/vm/includeDB_core 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/includeDB_core 2008-12-05 16:41:21.957634890 +0100 -@@ -720,11 +720,6 @@ - ciObjArray.hpp ciClassList.hpp - ciObjArray.hpp objArrayOop.hpp - --ciObjArray.cpp ciObjArray.hpp --ciObjArray.cpp ciNullObject.hpp --ciObjArray.cpp ciUtilities.hpp --ciObjArray.cpp objArrayOop.hpp -- - ciObjArrayKlass.cpp ciInstanceKlass.hpp - ciObjArrayKlass.cpp ciObjArrayKlass.hpp - ciObjArrayKlass.cpp ciObjArrayKlassKlass.hpp -@@ -3073,7 +3068,6 @@ - - oopMapCache.cpp allocation.inline.hpp - oopMapCache.cpp handles.inline.hpp --oopMapCache.cpp jvmtiRedefineClassesTrace.hpp - oopMapCache.cpp oop.inline.hpp - oopMapCache.cpp oopMapCache.hpp - oopMapCache.cpp resourceArea.hpp -diff -ruNb openjdk6/hotspot/src/share/vm/includeDB_gc_parallel openjdk/hotspot/src/share/vm/includeDB_gc_parallel ---- openjdk6/hotspot/src/share/vm/includeDB_gc_parallel 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/includeDB_gc_parallel 2008-12-05 16:41:21.967635041 +0100 -@@ -50,7 +50,6 @@ - - instanceRefKlass.cpp oop.pcgc.inline.hpp - instanceRefKlass.cpp psPromotionManager.inline.hpp --instanceRefKlass.cpp oop.pcgc.inline.hpp - instanceRefKlass.cpp psScavenge.inline.hpp - instanceRefKlass.cpp parOopClosures.inline.hpp - -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)abstractInterpreter.hpp 1.1 07/08/29 13:42:23 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -246,4 +243,3 @@ - public: - AbstractInterpreterGenerator(StubQueue* _code); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecode.cpp openjdk/hotspot/src/share/vm/interpreter/bytecode.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecode.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecode.cpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bytecode.cpp 1.69 07/05/05 17:05:36 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -206,4 +203,3 @@ - } - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecode.hpp openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecode.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bytecode.hpp 1.67 07/05/05 17:05:36 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bytecodeHistogram.cpp 1.29 07/05/05 17:05:36 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bytecodeHistogram.hpp 1.28 07/08/29 13:42:23 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bytecodeInterpreter.cpp 1.31 07/08/29 13:42:24 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bytecodeInterpreter.hpp 1.24 07/08/29 13:42:24 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bytecodeInterpreter.inline.hpp 1.10 07/08/29 13:42:24 JVM" --#endif - /* - * Copyright 2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml 2008-12-05 16:41:21.967635041 +0100 -@@ -1,25 +1,7 @@ - - - -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2008-12-05 16:41:21.967635041 +0100 -@@ -1,25 +1,7 @@ - - - - -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeStream.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeStream.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeStream.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeStream.cpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bytecodeStream.cpp 1.47 07/06/20 14:52:27 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeStream.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeStream.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeStream.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeStream.hpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bytecodeStream.hpp 1.54 07/06/20 14:52:27 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -173,5 +170,3 @@ - - bool is_active_breakpoint() const { return Bytecodes::is_active_breakpoint_at(bcp()); } - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bytecodeTracer.cpp 1.53 07/09/28 10:23:17 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bytecodeTracer.hpp 1.25 07/09/28 10:23:17 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodes.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodes.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodes.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodes.cpp 2008-12-05 16:41:21.967635041 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bytecodes.cpp 1.97 07/06/20 14:52:27 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodes.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodes.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/bytecodes.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodes.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bytecodes.hpp 1.79 07/06/20 14:52:28 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -359,4 +356,3 @@ - // Initialization - static void initialize (); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/cppInterpreter.cpp openjdk/hotspot/src/share/vm/interpreter/cppInterpreter.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/cppInterpreter.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/cppInterpreter.cpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cppInterpreter.cpp 1.1 07/08/29 13:42:24 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -136,4 +133,3 @@ - } - - #endif // CC_INTERP -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/cppInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/cppInterpreter.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/cppInterpreter.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/cppInterpreter.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cppInterpreter.hpp 1.1 07/08/29 13:42:24 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp openjdk/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cppInterpreterGenerator.hpp 1.1 07/08/07 10:57:15 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreter.cpp openjdk/hotspot/src/share/vm/interpreter/interpreter.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/interpreter.cpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/interpreter.cpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)interpreter.cpp 1.247 07/08/29 13:42:25 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreter.hpp openjdk/hotspot/src/share/vm/interpreter/interpreter.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/interpreter.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/interpreter.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)interpreter.hpp 1.154 07/08/29 13:42:25 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -135,4 +132,3 @@ - static InterpreterCodelet* codelet_containing(address pc) { return (InterpreterCodelet*)_code->stub_containing(pc); } - #include "incls/_interpreter_pd.hpp.incl" - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp openjdk/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp 2008-11-25 10:12:07.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)interpreterGenerator.hpp 1.1 07/08/07 10:57:15 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -39,5 +36,3 @@ - #include "incls/_interpreterGenerator_pd.hpp.incl" - - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)interpreterRuntime.cpp 1.488 07/08/29 13:42:25 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)interpreterRuntime.hpp 1.143 07/05/05 17:05:38 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/invocationCounter.cpp openjdk/hotspot/src/share/vm/interpreter/invocationCounter.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/invocationCounter.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/invocationCounter.cpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)invocationCounter.cpp 1.60 07/05/05 17:05:38 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -171,4 +168,3 @@ - void invocationCounter_init() { - InvocationCounter::reinitialize(DelayCompilationDuringStartup); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/invocationCounter.hpp openjdk/hotspot/src/share/vm/interpreter/invocationCounter.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/invocationCounter.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/invocationCounter.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)invocationCounter.hpp 1.50 07/08/29 13:42:26 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -138,5 +135,3 @@ - if (c > 0 && new_count == 0) new_count = 1; - set(state(), new_count); - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/linkResolver.cpp openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/linkResolver.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)linkResolver.cpp 1.174 07/05/05 17:05:40 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1001,4 +998,3 @@ - } - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/linkResolver.hpp openjdk/hotspot/src/share/vm/interpreter/linkResolver.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/linkResolver.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)linkResolver.hpp 1.74 07/05/05 17:05:39 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -172,4 +169,3 @@ - - static void resolve_invoke (CallInfo& result, Handle recv, constantPoolHandle pool, int index, Bytecodes::Code byte, TRAPS); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/oopMapCache.cpp openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/oopMapCache.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)oopMapCache.cpp 1.86 08/11/24 12:22:25 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -535,10 +532,6 @@ - if (!_array[i].is_empty() && _array[i].method()->is_old()) { - // Cache entry is occupied by an old redefined method and we don't want - // to pin it down so flush the entry. -- RC_TRACE(0x08000000, ("flush: %s(%s): cached entry @%d", -- _array[i].method()->name()->as_C_string(), -- _array[i].method()->signature()->as_C_string(), i)); -- - _array[i].flush(); - } - } -@@ -584,15 +577,6 @@ - // Entry is not in hashtable. - // Compute entry and return it - -- if (method->should_not_be_cached()) { -- // It is either not safe or not a good idea to cache this methodOop -- // at this time. We give the caller of lookup() a copy of the -- // interesting info via parameter entry_for, but we don't add it to -- // the cache. See the gory details in methodOop.cpp. -- compute_one_oop_map(method, bci, entry_for); -- return; -- } -- - // First search for an empty slot - for(i = 0; i < _probe_depth; i++) { - entry = entry_at(probe + i); -@@ -600,6 +584,12 @@ - entry->fill(method, bci); - entry_for->resource_copy(entry); - assert(!entry_for->is_empty(), "A non-empty oop map should be returned"); -+ if (method->is_old()) { -+ // The caller of lookup() will receive a copy of the interesting -+ // info via entry_for, but we don't keep an old redefined method in -+ // the cache to avoid pinning down the method. -+ entry->flush(); -+ } - return; - } - } -@@ -633,6 +623,13 @@ - } - assert(!entry_for->is_empty(), "A non-empty oop map should be returned"); - -+ if (method->is_old()) { -+ // The caller of lookup() will receive a copy of the interesting -+ // info via entry_for, but we don't keep an old redefined method in -+ // the cache to avoid pinning down the method. -+ entry->flush(); -+ } -+ - return; - } - -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/oopMapCache.hpp openjdk/hotspot/src/share/vm/interpreter/oopMapCache.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/oopMapCache.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/oopMapCache.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oopMapCache.hpp 1.57 07/05/05 17:05:39 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -191,4 +188,3 @@ - // Returns total no. of bytes allocated as part of OopMapCache's - static long memory_usage() PRODUCT_RETURN0; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/rewriter.cpp openjdk/hotspot/src/share/vm/interpreter/rewriter.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/rewriter.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/rewriter.cpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)rewriter.cpp 1.46 07/08/29 13:42:26 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/rewriter.hpp openjdk/hotspot/src/share/vm/interpreter/rewriter.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/rewriter.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/rewriter.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)rewriter.hpp 1.20 07/05/05 17:05:40 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -38,4 +35,3 @@ - public: - static void rewrite(instanceKlassHandle klass, TRAPS); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateInterpreter.cpp openjdk/hotspot/src/share/vm/interpreter/templateInterpreter.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/templateInterpreter.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/templateInterpreter.cpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)templateInterpreter.cpp 1.1 07/08/29 13:42:26 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/templateInterpreter.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/templateInterpreter.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/templateInterpreter.hpp 2008-12-05 16:41:21.977635192 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)templateInterpreter.hpp 1.2 07/09/25 17:07:43 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp openjdk/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)templateInterpreterGenerator.hpp 1.1 07/08/07 10:57:15 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateTable.cpp openjdk/hotspot/src/share/vm/interpreter/templateTable.cpp ---- openjdk6/hotspot/src/share/vm/interpreter/templateTable.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/templateTable.cpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)templateTable.cpp 1.108 07/05/05 17:05:37 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateTable.hpp openjdk/hotspot/src/share/vm/interpreter/templateTable.hpp ---- openjdk6/hotspot/src/share/vm/interpreter/templateTable.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/interpreter/templateTable.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)templateTable.hpp 1.91 07/05/05 17:05:39 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/libadt/dict.cpp openjdk/hotspot/src/share/vm/libadt/dict.cpp ---- openjdk6/hotspot/src/share/vm/libadt/dict.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/libadt/dict.cpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dict.cpp 1.35 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -384,4 +381,3 @@ - } - _key = _value = NULL; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/libadt/dict.hpp openjdk/hotspot/src/share/vm/libadt/dict.hpp ---- openjdk6/hotspot/src/share/vm/libadt/dict.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/libadt/dict.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)dict.hpp 1.24 07/05/05 17:05:40 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -118,4 +115,3 @@ - }; - - #endif // _DICT_ -- -diff -ruNb openjdk6/hotspot/src/share/vm/libadt/port.cpp openjdk/hotspot/src/share/vm/libadt/port.cpp ---- openjdk6/hotspot/src/share/vm/libadt/port.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/libadt/port.cpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)port.cpp 1.21 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 1997-1998 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/libadt/port.hpp openjdk/hotspot/src/share/vm/libadt/port.hpp ---- openjdk6/hotspot/src/share/vm/libadt/port.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/libadt/port.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)port.hpp 1.44 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/libadt/set.cpp openjdk/hotspot/src/share/vm/libadt/set.cpp ---- openjdk6/hotspot/src/share/vm/libadt/set.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/libadt/set.cpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)set.cpp 1.26 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/libadt/set.hpp openjdk/hotspot/src/share/vm/libadt/set.hpp ---- openjdk6/hotspot/src/share/vm/libadt/set.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/libadt/set.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)set.hpp 1.23 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 1997 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -252,4 +249,3 @@ - }; - - #endif // _SET_ -- -diff -ruNb openjdk6/hotspot/src/share/vm/libadt/vectset.cpp openjdk/hotspot/src/share/vm/libadt/vectset.cpp ---- openjdk6/hotspot/src/share/vm/libadt/vectset.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/libadt/vectset.cpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vectset.cpp 1.25 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -391,5 +388,3 @@ - } while( isize ); - return max_juint; // No element, iterated them all - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/libadt/vectset.hpp openjdk/hotspot/src/share/vm/libadt/vectset.hpp ---- openjdk6/hotspot/src/share/vm/libadt/vectset.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/libadt/vectset.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vectset.hpp 1.22 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 1997 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -177,4 +174,3 @@ - }; - - #endif // _VECTOR_SET_ -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocation.cpp openjdk/hotspot/src/share/vm/memory/allocation.cpp ---- openjdk6/hotspot/src/share/vm/memory/allocation.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/allocation.cpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)allocation.cpp 1.72 07/05/05 17:05:42 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -540,4 +537,3 @@ - } - - #endif // Non-product -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocation.hpp openjdk/hotspot/src/share/vm/memory/allocation.hpp ---- openjdk6/hotspot/src/share/vm/memory/allocation.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/allocation.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)allocation.hpp 1.77 07/05/05 17:05:42 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -410,4 +407,3 @@ - ReallocMark() PRODUCT_RETURN; - void check() PRODUCT_RETURN; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocation.inline.hpp openjdk/hotspot/src/share/vm/memory/allocation.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/allocation.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/allocation.inline.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)allocation.inline.hpp 1.22 07/05/05 17:05:42 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocationStats.cpp openjdk/hotspot/src/share/vm/memory/allocationStats.cpp ---- openjdk6/hotspot/src/share/vm/memory/allocationStats.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/allocationStats.cpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)allocationStats.cpp 1.6 07/05/05 17:05:42 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -31,4 +28,3 @@ - // Technically this should be derived from machine speed, and - // ideally it would be dynamically adjusted. - float AllocationStats::_threshold = ((float)CMS_SweepTimerThresholdMillis)/1000; -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocationStats.hpp openjdk/hotspot/src/share/vm/memory/allocationStats.hpp ---- openjdk6/hotspot/src/share/vm/memory/allocationStats.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/allocationStats.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)allocationStats.hpp 1.19 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/barrierSet.hpp openjdk/hotspot/src/share/vm/memory/barrierSet.hpp ---- openjdk6/hotspot/src/share/vm/memory/barrierSet.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/barrierSet.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)barrierSet.hpp 1.18 07/05/05 17:05:43 JVM" --#endif - /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/barrierSet.inline.hpp openjdk/hotspot/src/share/vm/memory/barrierSet.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/barrierSet.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/barrierSet.inline.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)barrierSet.inline.hpp 1.12 07/05/05 17:05:43 JVM" --#endif - /* - * Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.cpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp ---- openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)blockOffsetTable.cpp 1.82 07/05/05 17:05:42 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.hpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp ---- openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp 2008-12-05 16:41:21.987635343 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)blockOffsetTable.hpp 1.57 07/05/05 17:05:43 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)blockOffsetTable.inline.hpp 1.20 07/05/05 17:05:43 JVM" --#endif - /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/cardTableModRefBS.cpp openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.cpp ---- openjdk6/hotspot/src/share/vm/memory/cardTableModRefBS.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cardTableModRefBS.cpp 1.60 07/12/05 23:34:34 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -54,7 +51,7 @@ - _whole_heap(whole_heap), - _guard_index(cards_required(whole_heap.word_size()) - 1), - _last_valid_index(_guard_index - 1), -- _page_size(os::vm_page_size()), -+ _page_size(os::page_size_for_region(_guard_index + 1, _guard_index + 1, 1)), - _byte_map_size(compute_byte_map_size()) - { - _kind = BarrierSet::CardTableModRef; -diff -ruNb openjdk6/hotspot/src/share/vm/memory/cardTableModRefBS.hpp openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp ---- openjdk6/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cardTableModRefBS.hpp 1.53 07/10/04 10:49:32 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/cardTableRS.cpp openjdk/hotspot/src/share/vm/memory/cardTableRS.cpp ---- openjdk6/hotspot/src/share/vm/memory/cardTableRS.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/cardTableRS.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cardTableRS.cpp 1.45 07/05/25 12:54:50 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/cardTableRS.hpp openjdk/hotspot/src/share/vm/memory/cardTableRS.hpp ---- openjdk6/hotspot/src/share/vm/memory/cardTableRS.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/cardTableRS.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cardTableRS.hpp 1.29 07/05/05 17:05:44 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/classify.cpp openjdk/hotspot/src/share/vm/memory/classify.cpp ---- openjdk6/hotspot/src/share/vm/memory/classify.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/classify.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)classify.cpp 1.9 07/05/05 17:05:44 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/classify.hpp openjdk/hotspot/src/share/vm/memory/classify.hpp ---- openjdk6/hotspot/src/share/vm/memory/classify.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/classify.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)classify.hpp 1.10 07/05/05 17:05:42 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp ---- openjdk6/hotspot/src/share/vm/memory/collectorPolicy.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)collectorPolicy.cpp 1.90 07/10/04 10:49:37 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/collectorPolicy.hpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp ---- openjdk6/hotspot/src/share/vm/memory/collectorPolicy.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)collectorPolicy.hpp 1.41 07/05/29 09:44:14 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -262,4 +259,3 @@ - - void initialize_gc_policy_counters(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/compactPermGen.hpp openjdk/hotspot/src/share/vm/memory/compactPermGen.hpp ---- openjdk6/hotspot/src/share/vm/memory/compactPermGen.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/compactPermGen.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compactPermGen.hpp 1.17 07/05/05 17:05:45 JVM" --#endif - /* - * Copyright 2000-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/compactingPermGenGen.cpp openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.cpp ---- openjdk6/hotspot/src/share/vm/memory/compactingPermGenGen.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compactingPermGenGen.cpp 1.22 08/11/24 12:22:45 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -29,27 +26,9 @@ - #include "incls/_compactingPermGenGen.cpp.incl" - - --// An ObjectClosure helper: Recursively adjust all pointers in an object --// and all objects by referenced it. Clear marks on objects in order to --// prevent visiting any object twice. This helper is used when the --// RedefineClasses() API has been called. -- --class AdjustSharedObjectClosure : public ObjectClosure { --public: -- void do_object(oop obj) { -- if (obj->is_shared_readwrite()) { -- if (obj->mark()->is_marked()) { -- obj->init_mark(); // Don't revisit this object. -- obj->adjust_pointers(); // Adjust this object's references. -- } -- } -- } --}; -- -- --// An OopClosure helper: Recursively adjust all pointers in an object --// and all objects by referenced it. Clear marks on objects in order --// to prevent visiting any object twice. -+// Recursively adjust all pointers in an object and all objects by -+// referenced it. Clear marks on objects in order to prevent visiting -+// any object twice. - - class RecursiveAdjustSharedObjectClosure : public OopClosure { - public: -@@ -295,27 +274,9 @@ - // objects in the space will page in more objects than we need. - // Instead, use the system dictionary as strong roots into the read - // write space. --// --// If a RedefineClasses() call has been made, then we have to iterate --// over the entire shared read-write space in order to find all the --// objects that need to be forwarded. For example, it is possible for --// an nmethod to be found and marked in GC phase-1 only for the nmethod --// to be freed by the time we reach GC phase-3. The underlying method --// is still marked, but we can't (easily) find it in GC phase-3 so we --// blow up in GC phase-4. With RedefineClasses() we want replaced code --// (EMCP or obsolete) to go away (i.e., be collectible) once it is no --// longer being executed by any thread so we keep minimal attachments --// to the replaced code. However, we can't guarantee when those EMCP --// or obsolete methods will be collected so they may still be out there --// even after we've severed our minimal attachments. - - void CompactingPermGenGen::pre_adjust_pointers() { - if (spec()->enable_shared_spaces()) { -- if (JvmtiExport::has_redefined_a_class()) { -- // RedefineClasses() requires a brute force approach -- AdjustSharedObjectClosure blk; -- rw_space()->object_iterate(&blk); -- } else { - RecursiveAdjustSharedObjectClosure blk; - Universe::oops_do(&blk); - StringTable::oops_do(&blk); -@@ -323,7 +284,6 @@ - TraversePlaceholdersClosure tpc; - SystemDictionary::placeholders_do(&tpc); - } -- } - } - - -diff -ruNb openjdk6/hotspot/src/share/vm/memory/compactingPermGenGen.hpp openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.hpp ---- openjdk6/hotspot/src/share/vm/memory/compactingPermGenGen.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compactingPermGenGen.hpp 1.22 07/08/31 18:41:29 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/defNewGeneration.cpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp ---- openjdk6/hotspot/src/share/vm/memory/defNewGeneration.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)defNewGeneration.cpp 1.73 07/05/22 17:24:57 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/defNewGeneration.hpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.hpp ---- openjdk6/hotspot/src/share/vm/memory/defNewGeneration.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)defNewGeneration.hpp 1.40 07/05/17 15:54:44 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)defNewGeneration.inline.hpp 1.18 07/05/05 17:05:46 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/dump.cpp openjdk/hotspot/src/share/vm/memory/dump.cpp ---- openjdk6/hotspot/src/share/vm/memory/dump.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/dump.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dump.cpp 1.33 07/05/23 10:53:38 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/filemap.cpp openjdk/hotspot/src/share/vm/memory/filemap.cpp ---- openjdk6/hotspot/src/share/vm/memory/filemap.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/filemap.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)filemap.cpp 1.25 07/05/05 17:05:41 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/filemap.hpp openjdk/hotspot/src/share/vm/memory/filemap.hpp ---- openjdk6/hotspot/src/share/vm/memory/filemap.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/filemap.hpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)filemap.hpp 1.16 07/05/05 17:05:47 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/gcLocker.cpp openjdk/hotspot/src/share/vm/memory/gcLocker.cpp ---- openjdk6/hotspot/src/share/vm/memory/gcLocker.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/gcLocker.cpp 2008-12-05 16:41:21.997635494 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcLocker.cpp 1.52 07/05/17 15:54:45 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/gcLocker.hpp openjdk/hotspot/src/share/vm/memory/gcLocker.hpp ---- openjdk6/hotspot/src/share/vm/memory/gcLocker.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/gcLocker.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gcLocker.hpp 1.60 07/05/17 15:54:47 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -286,4 +283,3 @@ - ~No_Alloc_Verifier() {} - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/gcLocker.inline.hpp openjdk/hotspot/src/share/vm/memory/gcLocker.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/gcLocker.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/gcLocker.inline.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)gcLocker.inline.hpp 1.21 07/05/05 17:05:49 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -73,4 +70,3 @@ - } - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genCollectedHeap.cpp openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp ---- openjdk6/hotspot/src/share/vm/memory/genCollectedHeap.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)genCollectedHeap.cpp 1.190 07/06/15 16:44:02 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genCollectedHeap.hpp openjdk/hotspot/src/share/vm/memory/genCollectedHeap.hpp ---- openjdk6/hotspot/src/share/vm/memory/genCollectedHeap.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)genCollectedHeap.hpp 1.106 07/07/22 22:36:34 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genMarkSweep.cpp openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp ---- openjdk6/hotspot/src/share/vm/memory/genMarkSweep.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)genMarkSweep.cpp 1.40 07/05/17 15:54:55 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genMarkSweep.hpp openjdk/hotspot/src/share/vm/memory/genMarkSweep.hpp ---- openjdk6/hotspot/src/share/vm/memory/genMarkSweep.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genMarkSweep.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)genMarkSweep.hpp 1.11 07/05/05 17:05:49 JVM" --#endif - /* - * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genOopClosures.hpp openjdk/hotspot/src/share/vm/memory/genOopClosures.hpp ---- openjdk6/hotspot/src/share/vm/memory/genOopClosures.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genOopClosures.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)genOopClosures.hpp 1.64 07/05/29 09:44:15 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genOopClosures.inline.hpp openjdk/hotspot/src/share/vm/memory/genOopClosures.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/genOopClosures.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genOopClosures.inline.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)genOopClosures.inline.hpp 1.40 07/05/29 09:44:15 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genRemSet.cpp openjdk/hotspot/src/share/vm/memory/genRemSet.cpp ---- openjdk6/hotspot/src/share/vm/memory/genRemSet.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genRemSet.cpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)genRemSet.cpp 1.11 07/05/05 17:05:50 JVM" --#endif - /* - * Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genRemSet.hpp openjdk/hotspot/src/share/vm/memory/genRemSet.hpp ---- openjdk6/hotspot/src/share/vm/memory/genRemSet.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genRemSet.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)genRemSet.hpp 1.23 07/05/05 17:05:50 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/genRemSet.inline.hpp openjdk/hotspot/src/share/vm/memory/genRemSet.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/genRemSet.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/genRemSet.inline.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)genRemSet.inline.hpp 1.10 07/05/05 17:05:50 JVM" --#endif - /* - * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/generation.cpp openjdk/hotspot/src/share/vm/memory/generation.cpp ---- openjdk6/hotspot/src/share/vm/memory/generation.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)generation.cpp 1.245 07/05/05 17:05:51 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/generation.hpp openjdk/hotspot/src/share/vm/memory/generation.hpp ---- openjdk6/hotspot/src/share/vm/memory/generation.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/generation.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)generation.hpp 1.195 07/05/17 15:55:02 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/generation.inline.hpp openjdk/hotspot/src/share/vm/memory/generation.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/generation.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/generation.inline.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)generation.inline.hpp 1.38 07/05/05 17:05:50 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/generationSpec.cpp openjdk/hotspot/src/share/vm/memory/generationSpec.cpp ---- openjdk6/hotspot/src/share/vm/memory/generationSpec.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/generationSpec.cpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)generationSpec.cpp 1.29 07/05/29 09:44:15 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/generationSpec.hpp openjdk/hotspot/src/share/vm/memory/generationSpec.hpp ---- openjdk6/hotspot/src/share/vm/memory/generationSpec.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/generationSpec.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)generationSpec.hpp 1.17 07/05/05 17:05:50 JVM" --#endif - /* - * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/heap.cpp openjdk/hotspot/src/share/vm/memory/heap.cpp ---- openjdk6/hotspot/src/share/vm/memory/heap.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/heap.cpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)heap.cpp 1.55 07/10/04 10:49:31 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -483,4 +480,3 @@ - } - guarantee(count == 0, "missing free blocks"); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/heap.hpp openjdk/hotspot/src/share/vm/memory/heap.hpp ---- openjdk6/hotspot/src/share/vm/memory/heap.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/heap.hpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)heap.hpp 1.43 07/05/05 17:05:47 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/heapInspection.cpp openjdk/hotspot/src/share/vm/memory/heapInspection.cpp ---- openjdk6/hotspot/src/share/vm/memory/heapInspection.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/heapInspection.cpp 2008-12-05 16:41:22.007635645 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)heapInspection.cpp 1.21 07/05/29 09:44:16 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp ---- openjdk6/hotspot/src/share/vm/memory/heapInspection.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)heapInspection.hpp 1.17 07/07/02 11:47:11 JVM" --#endif - /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/iterator.cpp openjdk/hotspot/src/share/vm/memory/iterator.cpp ---- openjdk6/hotspot/src/share/vm/memory/iterator.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/iterator.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)iterator.cpp 1.18 07/05/05 17:05:50 JVM" --#endif - /* - * Copyright 1997-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -35,4 +32,3 @@ - void VoidClosure::do_void() { - ShouldNotCallThis(); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/iterator.hpp openjdk/hotspot/src/share/vm/memory/iterator.hpp ---- openjdk6/hotspot/src/share/vm/memory/iterator.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/iterator.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)iterator.hpp 1.38 07/05/05 17:05:52 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/memRegion.cpp openjdk/hotspot/src/share/vm/memory/memRegion.cpp ---- openjdk6/hotspot/src/share/vm/memory/memRegion.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/memRegion.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)memRegion.cpp 1.23 07/05/05 17:05:52 JVM" --#endif - /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/memRegion.hpp openjdk/hotspot/src/share/vm/memory/memRegion.hpp ---- openjdk6/hotspot/src/share/vm/memory/memRegion.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/memRegion.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)memRegion.hpp 1.27 07/05/05 17:05:53 JVM" --#endif - /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/modRefBarrierSet.hpp openjdk/hotspot/src/share/vm/memory/modRefBarrierSet.hpp ---- openjdk6/hotspot/src/share/vm/memory/modRefBarrierSet.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/modRefBarrierSet.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)modRefBarrierSet.hpp 1.16 07/05/05 17:05:53 JVM" --#endif - /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/oopFactory.cpp openjdk/hotspot/src/share/vm/memory/oopFactory.cpp ---- openjdk6/hotspot/src/share/vm/memory/oopFactory.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/oopFactory.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)oopFactory.cpp 1.83 07/05/05 17:05:53 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -146,4 +143,3 @@ - c->set_holder_klass(klass()); - return c; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/oopFactory.hpp openjdk/hotspot/src/share/vm/memory/oopFactory.hpp ---- openjdk6/hotspot/src/share/vm/memory/oopFactory.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/oopFactory.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oopFactory.hpp 1.61 07/05/05 17:05:53 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/permGen.cpp openjdk/hotspot/src/share/vm/memory/permGen.cpp ---- openjdk6/hotspot/src/share/vm/memory/permGen.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/permGen.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)permGen.cpp 1.54 07/05/29 09:44:16 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/permGen.hpp openjdk/hotspot/src/share/vm/memory/permGen.hpp ---- openjdk6/hotspot/src/share/vm/memory/permGen.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/permGen.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)permGen.hpp 1.38 07/05/29 09:44:16 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -74,4 +71,3 @@ - g->update_counters(); - } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/referencePolicy.cpp openjdk/hotspot/src/share/vm/memory/referencePolicy.cpp ---- openjdk6/hotspot/src/share/vm/memory/referencePolicy.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/referencePolicy.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)referencePolicy.cpp 1.12 07/05/05 17:05:54 JVM" --#endif - /* - * Copyright 2000-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -71,4 +68,3 @@ - - return true; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/referencePolicy.hpp openjdk/hotspot/src/share/vm/memory/referencePolicy.hpp ---- openjdk6/hotspot/src/share/vm/memory/referencePolicy.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/referencePolicy.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)referencePolicy.hpp 1.11 07/05/05 17:05:54 JVM" --#endif - /* - * Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/referenceProcessor.cpp openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp ---- openjdk6/hotspot/src/share/vm/memory/referenceProcessor.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)referenceProcessor.cpp 1.57 07/08/17 12:30:18 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/referenceProcessor.hpp openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp ---- openjdk6/hotspot/src/share/vm/memory/referenceProcessor.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)referenceProcessor.hpp 1.43 07/05/05 17:05:54 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -500,4 +497,3 @@ - oop _sentinel_ref; - int _n_queues; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/resourceArea.cpp openjdk/hotspot/src/share/vm/memory/resourceArea.cpp ---- openjdk6/hotspot/src/share/vm/memory/resourceArea.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/resourceArea.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)resourceArea.cpp 1.57 07/05/05 17:05:55 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/resourceArea.hpp openjdk/hotspot/src/share/vm/memory/resourceArea.hpp ---- openjdk6/hotspot/src/share/vm/memory/resourceArea.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/resourceArea.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)resourceArea.hpp 1.45 07/05/05 17:05:55 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/restore.cpp openjdk/hotspot/src/share/vm/memory/restore.cpp ---- openjdk6/hotspot/src/share/vm/memory/restore.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/restore.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)restore.cpp 1.14 07/05/05 17:05:44 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/serialize.cpp openjdk/hotspot/src/share/vm/memory/serialize.cpp ---- openjdk6/hotspot/src/share/vm/memory/serialize.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/serialize.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)serialize.cpp 1.9 07/05/05 17:05:55 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/sharedHeap.cpp openjdk/hotspot/src/share/vm/memory/sharedHeap.cpp ---- openjdk6/hotspot/src/share/vm/memory/sharedHeap.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/sharedHeap.cpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)sharedHeap.cpp 1.59 07/05/17 15:55:10 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/sharedHeap.hpp openjdk/hotspot/src/share/vm/memory/sharedHeap.hpp ---- openjdk6/hotspot/src/share/vm/memory/sharedHeap.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/sharedHeap.hpp 2008-12-05 16:41:22.017635795 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)sharedHeap.hpp 1.56 07/05/05 17:05:55 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -273,5 +270,3 @@ - size_t bytes_after, - size_t capacity); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/space.cpp openjdk/hotspot/src/share/vm/memory/space.cpp ---- openjdk6/hotspot/src/share/vm/memory/space.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/space.cpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)space.cpp 1.217 07/05/29 09:44:13 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/space.hpp openjdk/hotspot/src/share/vm/memory/space.hpp ---- openjdk6/hotspot/src/share/vm/memory/space.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/space.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)space.hpp 1.149 07/05/29 09:44:14 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/space.inline.hpp openjdk/hotspot/src/share/vm/memory/space.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/space.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/space.inline.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)space.inline.hpp 1.17 07/05/05 17:05:54 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/specialized_oop_closures.cpp openjdk/hotspot/src/share/vm/memory/specialized_oop_closures.cpp ---- openjdk6/hotspot/src/share/vm/memory/specialized_oop_closures.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/specialized_oop_closures.cpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)specialized_oop_closures.cpp 1.14 07/05/05 17:05:56 JVM" --#endif - /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/specialized_oop_closures.hpp openjdk/hotspot/src/share/vm/memory/specialized_oop_closures.hpp ---- openjdk6/hotspot/src/share/vm/memory/specialized_oop_closures.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/specialized_oop_closures.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)specialized_oop_closures.hpp 1.30 07/05/29 09:44:17 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/tenuredGeneration.cpp openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp ---- openjdk6/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)tenuredGeneration.cpp 1.47 07/05/29 09:44:17 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/tenuredGeneration.hpp openjdk/hotspot/src/share/vm/memory/tenuredGeneration.hpp ---- openjdk6/hotspot/src/share/vm/memory/tenuredGeneration.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)tenuredGeneration.hpp 1.27 07/05/29 09:44:17 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp ---- openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)threadLocalAllocBuffer.cpp 1.55 07/07/05 17:12:38 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp ---- openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)threadLocalAllocBuffer.hpp 1.35 07/07/05 17:12:36 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)threadLocalAllocBuffer.inline.hpp 1.29 07/05/05 17:05:56 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/universe.cpp openjdk/hotspot/src/share/vm/memory/universe.cpp ---- openjdk6/hotspot/src/share/vm/memory/universe.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/universe.cpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)universe.cpp 1.361 07/09/01 18:01:02 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/universe.hpp openjdk/hotspot/src/share/vm/memory/universe.hpp ---- openjdk6/hotspot/src/share/vm/memory/universe.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/universe.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)universe.hpp 1.183 07/08/09 09:12:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/memory/universe.inline.hpp openjdk/hotspot/src/share/vm/memory/universe.inline.hpp ---- openjdk6/hotspot/src/share/vm/memory/universe.inline.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/universe.inline.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)universe.inline.hpp 1.47 07/05/05 17:05:57 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -38,6 +35,3 @@ - inline bool Universe::field_type_should_be_aligned(BasicType type) { - return type == T_DOUBLE || type == T_LONG; - } -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/memory/watermark.hpp openjdk/hotspot/src/share/vm/memory/watermark.hpp ---- openjdk6/hotspot/src/share/vm/memory/watermark.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/watermark.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)watermark.hpp 1.14 07/05/05 17:05:56 JVM" --#endif - /* - * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -54,4 +51,3 @@ - inline bool operator!=(const WaterMark& x, const WaterMark& y) { - return !(x == y); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayKlass.cpp openjdk/hotspot/src/share/vm/oops/arrayKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/arrayKlass.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/arrayKlass.cpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)arrayKlass.cpp 1.95 07/05/05 17:05:59 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayKlass.hpp openjdk/hotspot/src/share/vm/oops/arrayKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/arrayKlass.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/arrayKlass.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)arrayKlass.hpp 1.66 07/05/05 17:05:58 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -135,4 +132,3 @@ - // Verification - void oop_verify_on(oop obj, outputStream* st); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayKlassKlass.cpp openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/arrayKlassKlass.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.cpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)arrayKlassKlass.cpp 1.56 07/05/29 09:44:17 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayKlassKlass.hpp openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/arrayKlassKlass.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.hpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)arrayKlassKlass.hpp 1.39 07/05/29 09:44:18 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -70,4 +67,3 @@ - const char* internal_name() const; - void oop_verify_on(oop obj, outputStream* st); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayOop.cpp openjdk/hotspot/src/share/vm/oops/arrayOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/arrayOop.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/arrayOop.cpp 2008-12-05 16:41:22.027635946 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)arrayOop.cpp 1.18 07/05/05 17:05:58 JVM" --#endif - /* - * Copyright 1997 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -29,4 +26,3 @@ - # include "incls/_arrayOop.cpp.incl" - - // <> -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayOop.hpp openjdk/hotspot/src/share/vm/oops/arrayOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/arrayOop.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/arrayOop.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)arrayOop.hpp 1.35 07/05/05 17:06:00 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compiledICHolderKlass.cpp 1.41 07/05/29 09:44:18 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/compiledICHolderKlass.hpp openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/compiledICHolderKlass.hpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compiledICHolderKlass.hpp 1.32 07/05/29 09:44:18 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -84,4 +81,3 @@ - void oop_verify_on(oop obj, outputStream* st); - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/compiledICHolderOop.cpp openjdk/hotspot/src/share/vm/oops/compiledICHolderOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/compiledICHolderOop.cpp 2008-11-25 10:12:08.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderOop.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compiledICHolderOop.cpp 1.12 07/05/05 17:05:59 JVM" --#endif - /* - * Copyright 1998 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -29,4 +26,3 @@ - # include "incls/_compiledICHolderOop.cpp.incl" - - // <> -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/compiledICHolderOop.hpp openjdk/hotspot/src/share/vm/oops/compiledICHolderOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/compiledICHolderOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderOop.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compiledICHolderOop.hpp 1.20 07/05/05 17:05:59 JVM" --#endif - /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/constMethodKlass.cpp openjdk/hotspot/src/share/vm/oops/constMethodKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/constMethodKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constMethodKlass.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)constMethodKlass.cpp 1.25 07/08/29 13:42:26 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -302,4 +299,3 @@ - // Temporarily set exception_table to point to self - m->set_exception_table((typeArrayOop)obj); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/constMethodKlass.hpp openjdk/hotspot/src/share/vm/oops/constMethodKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/constMethodKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constMethodKlass.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)constMethodKlass.hpp 1.15 07/05/29 09:44:18 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -91,4 +88,3 @@ - bool oop_partially_loaded(oop obj) const; - void oop_set_partially_loaded(oop obj); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/constMethodOop.cpp openjdk/hotspot/src/share/vm/oops/constMethodOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/constMethodOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constMethodOop.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)constMethodOop.cpp 1.11 07/05/05 17:06:00 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/constMethodOop.hpp openjdk/hotspot/src/share/vm/oops/constMethodOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/constMethodOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constMethodOop.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)constMethodOop.hpp 1.24 07/05/05 17:05:59 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/constantPoolKlass.cpp openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/constantPoolKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)constantPoolKlass.cpp 1.105 07/05/29 09:44:18 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/constantPoolKlass.hpp openjdk/hotspot/src/share/vm/oops/constantPoolKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/constantPoolKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constantPoolKlass.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)constantPoolKlass.hpp 1.51 07/05/29 09:44:18 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -78,4 +75,3 @@ - static void preload_and_initialize_all_classes(oop constant_pool, TRAPS); - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/constantPoolOop.cpp openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/constantPoolOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)constantPoolOop.cpp 1.104 07/05/05 17:06:01 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/constantPoolOop.hpp openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/constantPoolOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)constantPoolOop.hpp 1.105 07/08/29 13:42:26 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/cpCacheKlass.cpp openjdk/hotspot/src/share/vm/oops/cpCacheKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/cpCacheKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/cpCacheKlass.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cpCacheKlass.cpp 1.46 07/05/29 09:44:18 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -206,4 +203,3 @@ - const char* constantPoolCacheKlass::internal_name() const { - return "{constant pool cache}"; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/cpCacheKlass.hpp openjdk/hotspot/src/share/vm/oops/cpCacheKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/cpCacheKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/cpCacheKlass.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cpCacheKlass.hpp 1.33 07/05/29 09:44:19 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -69,4 +66,3 @@ - const char* internal_name() const; - void oop_verify_on(oop obj, outputStream* st); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/cpCacheOop.cpp openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/cpCacheOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cpCacheOop.cpp 1.79 07/05/29 09:44:19 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/cpCacheOop.hpp openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/cpCacheOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cpCacheOop.hpp 1.74 07/05/29 09:44:19 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -326,4 +323,3 @@ - void adjust_method_entries(methodOop* old_methods, methodOop* new_methods, - int methods_length, bool * trace_name_printed); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/generateOopMap.cpp openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp ---- openjdk6/hotspot/src/share/vm/oops/generateOopMap.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp 2008-12-05 16:41:22.037636097 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)generateOopMap.cpp 1.141 07/05/05 17:06:03 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -2537,4 +2534,3 @@ - #endif - return methodHandle(THREAD, method()); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/generateOopMap.hpp openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp ---- openjdk6/hotspot/src/share/vm/oops/generateOopMap.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)generateOopMap.hpp 1.65 07/05/05 17:06:01 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -554,6 +551,3 @@ - - // Call compute_map(CHECK) to generate info. - }; -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceKlass.cpp openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/instanceKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)instanceKlass.cpp 1.324 08/11/24 12:22:48 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -2168,20 +2165,12 @@ - RC_TRACE(0x00000100, ("adding previous version ref for %s @%d, EMCP_cnt=%d", - ikh->external_name(), _previous_versions->length(), emcp_method_count)); - constantPoolHandle cp_h(ikh->constants()); -- jobject cp_ref; -- if (cp_h->is_shared()) { -- // a shared ConstantPool requires a regular reference; a weak -- // reference would be collectible -- cp_ref = JNIHandles::make_global(cp_h); -- } else { -- cp_ref = JNIHandles::make_weak_global(cp_h); -- } -+ jweak cp_ref = JNIHandles::make_weak_global(cp_h); - PreviousVersionNode * pv_node = NULL; - objArrayOop old_methods = ikh->methods(); - - if (emcp_method_count == 0) { -- // non-shared ConstantPool gets a weak reference -- pv_node = new PreviousVersionNode(cp_ref, !cp_h->is_shared(), NULL); -+ pv_node = new PreviousVersionNode(cp_ref, NULL); - RC_TRACE(0x00000400, - ("add: all methods are obsolete; flushing any EMCP weak refs")); - } else { -@@ -2201,8 +2190,7 @@ - } - } - } -- // non-shared ConstantPool gets a weak reference -- pv_node = new PreviousVersionNode(cp_ref, !cp_h->is_shared(), method_refs); -+ pv_node = new PreviousVersionNode(cp_ref, method_refs); - } - - _previous_versions->append(pv_node); -@@ -2220,7 +2208,7 @@ - // check the previous versions array for a GC'ed weak refs - pv_node = _previous_versions->at(i); - cp_ref = pv_node->prev_constant_pool(); -- assert(cp_ref != NULL, "cp ref was unexpectedly cleared"); -+ assert(cp_ref != NULL, "weak cp ref was unexpectedly cleared"); - if (cp_ref == NULL) { - delete pv_node; - _previous_versions->remove_at(i); -@@ -2293,7 +2281,7 @@ - // check the previous versions array for a GC'ed weak refs - pv_node = _previous_versions->at(j); - cp_ref = pv_node->prev_constant_pool(); -- assert(cp_ref != NULL, "cp ref was unexpectedly cleared"); -+ assert(cp_ref != NULL, "weak cp ref was unexpectedly cleared"); - if (cp_ref == NULL) { - delete pv_node; - _previous_versions->remove_at(j); -@@ -2391,8 +2379,8 @@ - // been GC'ed - PreviousVersionNode * pv_node = _previous_versions->at(i); - -- jobject cp_ref = pv_node->prev_constant_pool(); -- assert(cp_ref != NULL, "cp reference was unexpectedly cleared"); -+ jweak cp_ref = pv_node->prev_constant_pool(); -+ assert(cp_ref != NULL, "weak reference was unexpectedly cleared"); - if (cp_ref == NULL) { - continue; // robustness - } -@@ -2452,11 +2440,10 @@ - - // Construct a PreviousVersionNode entry for the array hung off - // the instanceKlass. --PreviousVersionNode::PreviousVersionNode(jobject prev_constant_pool, -- bool prev_cp_is_weak, GrowableArray* prev_EMCP_methods) { -+PreviousVersionNode::PreviousVersionNode(jweak prev_constant_pool, -+ GrowableArray* prev_EMCP_methods) { - - _prev_constant_pool = prev_constant_pool; -- _prev_cp_is_weak = prev_cp_is_weak; - _prev_EMCP_methods = prev_EMCP_methods; - } - -@@ -2464,11 +2451,7 @@ - // Destroy a PreviousVersionNode - PreviousVersionNode::~PreviousVersionNode() { - if (_prev_constant_pool != NULL) { -- if (_prev_cp_is_weak) { - JNIHandles::destroy_weak_global(_prev_constant_pool); -- } else { -- JNIHandles::destroy_global(_prev_constant_pool); -- } - } - - if (_prev_EMCP_methods != NULL) { -@@ -2488,8 +2471,8 @@ - _prev_constant_pool_handle = constantPoolHandle(); // NULL handle - _prev_EMCP_method_handles = NULL; - -- jobject cp_ref = pv_node->prev_constant_pool(); -- assert(cp_ref != NULL, "constant pool ref was unexpectedly cleared"); -+ jweak cp_ref = pv_node->prev_constant_pool(); -+ assert(cp_ref != NULL, "weak constant pool ref was unexpectedly cleared"); - if (cp_ref == NULL) { - return; // robustness - } -diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceKlass.hpp openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/instanceKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)instanceKlass.hpp 1.201 08/11/24 12:22:50 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -841,20 +838,11 @@ - // A collection point for interesting information about the previous - // version(s) of an instanceKlass. This class uses weak references to - // the information so that the information may be collected as needed --// by the system. If the information is shared, then a regular --// reference must be used because a weak reference would be seen as --// collectible. A GrowableArray of PreviousVersionNodes is attached -+// by the system. A GrowableArray of PreviousVersionNodes is attached - // to the instanceKlass as needed. See PreviousVersionWalker below. - class PreviousVersionNode : public CHeapObj { - private: -- // A shared ConstantPool is never collected so we'll always have -- // a reference to it so we can update items in the cache. We'll -- // have a weak reference to a non-shared ConstantPool until all -- // of the methods (EMCP or obsolete) have been collected; the -- // non-shared ConstantPool becomes collectible at that point. -- jobject _prev_constant_pool; // regular or weak reference -- bool _prev_cp_is_weak; // true if not a shared ConstantPool -- -+ jweak _prev_constant_pool; - // If the previous version of the instanceKlass doesn't have any - // EMCP methods, then _prev_EMCP_methods will be NULL. If all the - // EMCP methods have been collected, then _prev_EMCP_methods can -@@ -862,10 +850,10 @@ - GrowableArray* _prev_EMCP_methods; - - public: -- PreviousVersionNode(jobject prev_constant_pool, bool prev_cp_is_weak, -+ PreviousVersionNode(jweak prev_constant_pool, - GrowableArray* prev_EMCP_methods); - ~PreviousVersionNode(); -- jobject prev_constant_pool() const { -+ jweak prev_constant_pool() const { - return _prev_constant_pool; - } - GrowableArray* prev_EMCP_methods() const { -diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceKlassKlass.cpp openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/instanceKlassKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)instanceKlassKlass.cpp 1.157 07/07/27 16:19:58 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -810,4 +807,3 @@ - assert(ik->transitive_interfaces() == NULL, "just checking"); - ik->set_transitive_interfaces((objArrayOop) obj); // Temporarily set transitive_interfaces to point to self - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceKlassKlass.hpp openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/instanceKlassKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)instanceKlassKlass.hpp 1.54 07/05/29 09:44:21 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -87,4 +84,3 @@ - bool oop_partially_loaded(oop obj) const; - void oop_set_partially_loaded(oop obj); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceOop.cpp openjdk/hotspot/src/share/vm/oops/instanceOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/instanceOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceOop.cpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)instanceOop.cpp 1.14 07/05/05 17:06:03 JVM" --#endif - /* - * Copyright 1997 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -29,4 +26,3 @@ - # include "incls/_instanceOop.cpp.incl" - - // <> -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceOop.hpp openjdk/hotspot/src/share/vm/oops/instanceOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/instanceOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceOop.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)instanceOop.hpp 1.15 07/05/05 17:06:04 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -32,5 +29,3 @@ - public: - static int header_size() { return sizeof(instanceOopDesc)/HeapWordSize; } - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceRefKlass.cpp openjdk/hotspot/src/share/vm/oops/instanceRefKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/instanceRefKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceRefKlass.cpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)instanceRefKlass.cpp 1.90 07/05/29 09:44:20 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceRefKlass.hpp openjdk/hotspot/src/share/vm/oops/instanceRefKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/instanceRefKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/instanceRefKlass.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)instanceRefKlass.hpp 1.62 07/05/29 09:44:21 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klass.cpp openjdk/hotspot/src/share/vm/oops/klass.cpp ---- openjdk6/hotspot/src/share/vm/oops/klass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klass.cpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)klass.cpp 1.119 07/05/05 17:06:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klass.hpp openjdk/hotspot/src/share/vm/oops/klass.hpp ---- openjdk6/hotspot/src/share/vm/oops/klass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klass.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)klass.hpp 1.142 07/05/29 09:44:17 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -768,4 +765,3 @@ - void verify_vtable_index(int index); - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klass.inline.hpp openjdk/hotspot/src/share/vm/oops/klass.inline.hpp ---- openjdk6/hotspot/src/share/vm/oops/klass.inline.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klass.inline.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)klass.inline.hpp 1.5 07/05/05 17:06:04 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassKlass.cpp openjdk/hotspot/src/share/vm/oops/klassKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/klassKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klassKlass.cpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)klassKlass.cpp 1.70 07/08/09 09:12:01 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassKlass.hpp openjdk/hotspot/src/share/vm/oops/klassKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/klassKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klassKlass.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)klassKlass.hpp 1.44 07/05/29 09:44:21 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -82,4 +79,3 @@ - const char* internal_name() const; - void oop_verify_on(oop obj, outputStream* st); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassOop.cpp openjdk/hotspot/src/share/vm/oops/klassOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/klassOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klassOop.cpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)klassOop.cpp 1.14 07/05/05 17:06:04 JVM" --#endif - /* - * Copyright 1997 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -27,4 +24,3 @@ - - # include "incls/_precompiled.incl" - # include "incls/_klassOop.cpp.incl" -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassOop.hpp openjdk/hotspot/src/share/vm/oops/klassOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/klassOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klassOop.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)klassOop.hpp 1.19 07/05/05 17:06:04 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -45,6 +42,3 @@ - // returns the Klass part containing dispatching behavior - Klass* klass_part() { return (Klass*)((address)this + klass_part_offset_in_bytes()); } - }; -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassPS.hpp openjdk/hotspot/src/share/vm/oops/klassPS.hpp ---- openjdk6/hotspot/src/share/vm/oops/klassPS.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klassPS.hpp 2008-12-05 16:41:22.047636248 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)klassPS.hpp 1.1 07/05/14 06:13:07 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassVtable.cpp openjdk/hotspot/src/share/vm/oops/klassVtable.cpp ---- openjdk6/hotspot/src/share/vm/oops/klassVtable.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klassVtable.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)klassVtable.cpp 1.146 07/07/19 12:19:09 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -738,7 +735,7 @@ - } - } - -- // The length of the itable was either zero, or it has not yet been initialized. -+ // This lenght of the itable was either zero, or it has not yet been initialized. - _table_offset = 0; - _size_offset_table = 0; - _size_method_table = 0; -@@ -873,19 +870,16 @@ - - // Initialization - void klassItable::initialize_itable(bool checkconstraints, TRAPS) { -- // Cannot be setup doing bootstrapping, interfaces don't have -- // itables, and klass with only ones entry have empty itables -- if (Universe::is_bootstrapping() || -- _klass->is_interface() || -- _klass->itable_length() == itableOffsetEntry::size()) return; -- -- // There's alway an extra itable entry so we can null-terminate it. -- guarantee(size_offset_table() >= 1, "too small"); -- int num_interfaces = size_offset_table() - 1; -+ // Cannot be setup doing bootstrapping -+ if (Universe::is_bootstrapping()) return; -+ -+ int num_interfaces = nof_interfaces(); - if (num_interfaces > 0) { -- if (TraceItables) tty->print_cr("%3d: Initializing itables for %s", ++initialize_count, -- _klass->name()->as_C_string()); -+ if (TraceItables) tty->print_cr("%3d: Initializing itables for %s", ++initialize_count, _klass->name()->as_C_string()); - -+ // In debug mode, we got an extra NULL/NULL entry -+ debug_only(num_interfaces--); -+ assert(num_interfaces > 0, "to few interfaces in offset itable"); - - // Interate through all interfaces - int i; -@@ -896,10 +890,12 @@ - initialize_itable_for_interface(ioe->offset(), interf_h, checkconstraints, CHECK); - } - -- } -+#ifdef ASSERT - // Check that the last entry is empty -- itableOffsetEntry* ioe = offset_entry(size_offset_table() - 1); -- guarantee(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing"); -+ itableOffsetEntry* ioe = offset_entry(i); -+ assert(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing"); -+#endif -+ } - } - - -@@ -976,7 +972,7 @@ - } - } - --// Update entry for specific methodOop -+// Update entry for specic methodOop - void klassItable::initialize_with_method(methodOop m) { - itableMethodEntry* ime = method_entry(0); - for(int i = 0; i < _size_method_table; i++) { -@@ -1089,8 +1085,12 @@ - CountInterfacesClosure cic; - visit_all_interfaces(transitive_interfaces(), &cic); - -- // There's alway an extra itable entry so we can null-terminate it. -- int itable_size = calc_itable_size(cic.nof_interfaces() + 1, cic.nof_methods()); -+ // Add one extra entry in debug mode, so we can null-terminate the table -+ int nof_methods = cic.nof_methods(); -+ int nof_interfaces = cic.nof_interfaces(); -+ debug_only(if (nof_interfaces > 0) nof_interfaces++); -+ -+ int itable_size = calc_itable_size(nof_interfaces, nof_methods); - - // Statistics - update_stats(itable_size * HeapWordSize); -@@ -1110,8 +1110,8 @@ - int nof_methods = cic.nof_methods(); - int nof_interfaces = cic.nof_interfaces(); - -- // Add one extra entry so we can null-terminate the table -- nof_interfaces++; -+ // Add one extra entry in debug mode, so we can null-terminate the table -+ debug_only(if (nof_interfaces > 0) nof_interfaces++); - - assert(compute_itable_size(objArrayHandle(klass->transitive_interfaces())) == - calc_itable_size(nof_interfaces, nof_methods), -@@ -1320,5 +1320,3 @@ - } - - #endif // PRODUCT -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassVtable.hpp openjdk/hotspot/src/share/vm/oops/klassVtable.hpp ---- openjdk6/hotspot/src/share/vm/oops/klassVtable.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/klassVtable.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)klassVtable.hpp 1.62 07/07/19 12:19:09 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -262,7 +259,7 @@ - itableMethodEntry* method_entry(int i) { assert(0 <= i && i <= _size_method_table, "index out of bounds"); - return &((itableMethodEntry*)method_start())[i]; } - -- int size_offset_table() { return _size_offset_table; } -+ int nof_interfaces() { return _size_offset_table; } - - // Initialization - void initialize_itable(bool checkconstraints, TRAPS); -diff -ruNb openjdk6/hotspot/src/share/vm/oops/markOop.cpp openjdk/hotspot/src/share/vm/oops/markOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/markOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/markOop.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)markOop.cpp 1.30 08/11/24 12:22:53 JVM" --#endif - /* - * Copyright 1997-1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -40,32 +37,3 @@ - st->print("age %d)", age()); - } - } -- -- --// Give advice about whether the oop that contains this markOop --// should be cached or not. --bool markOopDesc::should_not_be_cached() const { -- // the cast is because decode_pointer() isn't marked const -- if (is_marked() && ((markOopDesc *)this)->decode_pointer() != NULL) { -- // If the oop containing this markOop is being forwarded, then -- // we are in the middle of GC and we do not want the containing -- // oop to be added to a cache. We have no way of knowing whether -- // the cache has already been visited by the current GC phase so -- // we don't know whether the forwarded oop will be properly -- // processed in this phase. If the forwarded oop is not properly -- // processed, then we'll see strange crashes or asserts during -- // the next GC run because the markOop will contain an unexpected -- // value. -- // -- // This situation has been seen when we are GC'ing a methodOop -- // because we use the methodOop while we're GC'ing it. Scary -- // stuff. Some of the uses the methodOop cause the methodOop to -- // be added to the OopMapCache in the instanceKlass as a side -- // effect. This check lets the cache maintainer know when a -- // cache addition would not be safe. -- return true; -- } -- -- // caching the containing oop should be just fine -- return false; --} -diff -ruNb openjdk6/hotspot/src/share/vm/oops/markOop.hpp openjdk/hotspot/src/share/vm/oops/markOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/markOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/markOop.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)markOop.hpp 1.66 08/11/24 12:22:54 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -360,7 +357,4 @@ - - // Recover address of oop from encoded form used in mark - inline void* decode_pointer() { if (UseBiasedLocking && has_bias_pattern()) return NULL; return clear_lock_bits(); } -- -- // see the definition in markOop.cpp for the gory details -- bool should_not_be_cached() const; - }; -diff -ruNb openjdk6/hotspot/src/share/vm/oops/markOop.inline.hpp openjdk/hotspot/src/share/vm/oops/markOop.inline.hpp ---- openjdk6/hotspot/src/share/vm/oops/markOop.inline.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/markOop.inline.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)markOop.inline.hpp 1.7 07/05/05 17:06:04 JVM" --#endif - /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodDataKlass.cpp openjdk/hotspot/src/share/vm/oops/methodDataKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/methodDataKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/methodDataKlass.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)methodDataKlass.cpp 1.36 07/05/29 09:44:22 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -239,4 +236,3 @@ - guarantee(m->is_perm(), "should be in permspace"); - m->verify_data_on(st); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodDataKlass.hpp openjdk/hotspot/src/share/vm/oops/methodDataKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/methodDataKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/methodDataKlass.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)methodDataKlass.hpp 1.30 07/05/29 09:44:23 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodDataOop.cpp openjdk/hotspot/src/share/vm/oops/methodDataOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/methodDataOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/methodDataOop.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)methodDataOop.cpp 1.51 07/05/29 09:44:22 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodDataOop.hpp openjdk/hotspot/src/share/vm/oops/methodDataOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/methodDataOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/methodDataOop.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)methodDataOop.hpp 1.54 07/08/29 13:42:27 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodKlass.cpp openjdk/hotspot/src/share/vm/oops/methodKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/methodKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/methodKlass.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)methodKlass.cpp 1.120 07/05/29 09:44:23 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -362,4 +359,3 @@ - constMethodKlass* ck = constMethodKlass::cast(xconst->klass()); - ck->oop_set_partially_loaded(xconst); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodKlass.hpp openjdk/hotspot/src/share/vm/oops/methodKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/methodKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/methodKlass.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)methodKlass.hpp 1.49 07/05/29 09:44:23 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -85,4 +82,3 @@ - bool oop_partially_loaded(oop obj) const; - void oop_set_partially_loaded(oop obj); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodOop.cpp openjdk/hotspot/src/share/vm/oops/methodOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/methodOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)methodOop.cpp 1.314 08/11/24 12:22:56 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -768,28 +765,6 @@ - } - - --// give advice about whether this methodOop should be cached or not --bool methodOopDesc::should_not_be_cached() const { -- if (is_old()) { -- // This method has been redefined. It is either EMCP or obsolete -- // and we don't want to cache it because that would pin the method -- // down and prevent it from being collectible if and when it -- // finishes executing. -- return true; -- } -- -- if (mark()->should_not_be_cached()) { -- // It is either not safe or not a good idea to cache this -- // method at this time because of the state of the embedded -- // markOop. See markOop.cpp for the gory details. -- return true; -- } -- -- // caching this method should be just fine -- return false; --} -- -- - methodHandle methodOopDesc:: clone_with_new_data(methodHandle m, u_char* new_code, int new_code_length, - u_char* new_compressed_linenumber_table, int new_compressed_linenumber_size, TRAPS) { - // Code below does not work for native methods - they should never get rewritten anyway -diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodOop.hpp openjdk/hotspot/src/share/vm/oops/methodOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/methodOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/methodOop.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)methodOop.hpp 1.221 08/11/24 12:22:56 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -527,8 +524,6 @@ - void set_is_old() { _access_flags.set_is_old(); } - bool is_obsolete() const { return access_flags().is_obsolete(); } - void set_is_obsolete() { _access_flags.set_is_obsolete(); } -- // see the definition in methodOop.cpp for the gory details -- bool should_not_be_cached() const; - - // JVMTI Native method prefixing support: - bool is_prefixed_native() const { return access_flags().is_prefixed_native(); } -@@ -742,5 +737,3 @@ - void set(methodOop method); - void clear(methodOop method); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayKlass.cpp openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/objArrayKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)objArrayKlass.cpp 1.147 07/05/29 09:44:23 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayKlass.hpp openjdk/hotspot/src/share/vm/oops/objArrayKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/objArrayKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)objArrayKlass.hpp 1.87 07/05/29 09:44:23 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -129,4 +126,3 @@ - void oop_verify_old_oop(oop obj, oop* p, bool allow_dirty); - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)objArrayKlassKlass.cpp 1.79 07/05/29 09:44:24 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -309,4 +306,3 @@ - Klass* bk = Klass::cast(oak->bottom_klass()); - guarantee(bk->oop_is_instance() || bk->oop_is_typeArray(), "invalid bottom klass"); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/objArrayKlassKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.hpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)objArrayKlassKlass.hpp 1.48 07/05/29 09:44:24 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -80,4 +77,3 @@ - void oop_verify_on(oop obj, outputStream* st); - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayOop.cpp openjdk/hotspot/src/share/vm/oops/objArrayOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/objArrayOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/objArrayOop.cpp 2008-12-05 16:41:22.057636399 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)objArrayOop.cpp 1.14 07/05/05 17:06:07 JVM" --#endif - /* - * Copyright 1997 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -29,4 +26,3 @@ - # include "incls/_objArrayOop.cpp.incl" - - // <> -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayOop.hpp openjdk/hotspot/src/share/vm/oops/objArrayOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/objArrayOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/objArrayOop.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)objArrayOop.hpp 1.29 07/05/05 17:06:07 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.cpp openjdk/hotspot/src/share/vm/oops/oop.cpp ---- openjdk6/hotspot/src/share/vm/oops/oop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oop.cpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)oop.cpp 1.99 07/05/29 09:44:21 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.hpp openjdk/hotspot/src/share/vm/oops/oop.hpp ---- openjdk6/hotspot/src/share/vm/oops/oop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oop.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oop.hpp 1.118 07/08/31 18:42:30 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.inline.hpp openjdk/hotspot/src/share/vm/oops/oop.inline.hpp ---- openjdk6/hotspot/src/share/vm/oops/oop.inline.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oop.inline.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oop.inline.hpp 1.142 07/09/25 16:47:44 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.inline2.hpp openjdk/hotspot/src/share/vm/oops/oop.inline2.hpp ---- openjdk6/hotspot/src/share/vm/oops/oop.inline2.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oop.inline2.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oop.inline2.hpp 1.14 07/08/31 18:42:30 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp openjdk/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp ---- openjdk6/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oop.pcgc.inline.hpp 1.16 07/05/29 09:44:24 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.psgc.inline.hpp openjdk/hotspot/src/share/vm/oops/oop.psgc.inline.hpp ---- openjdk6/hotspot/src/share/vm/oops/oop.psgc.inline.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oop.psgc.inline.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oop.psgc.inline.hpp 1.17 07/05/05 17:06:07 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -44,4 +41,3 @@ - } - // Else skip it. The typeArrayKlass in the header never needs scavenging. - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/oopsHierarchy.cpp openjdk/hotspot/src/share/vm/oops/oopsHierarchy.cpp ---- openjdk6/hotspot/src/share/vm/oops/oopsHierarchy.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oopsHierarchy.cpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oopsHierarchy.cpp 1.7 07/05/05 17:06:08 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/oopsHierarchy.hpp openjdk/hotspot/src/share/vm/oops/oopsHierarchy.hpp ---- openjdk6/hotspot/src/share/vm/oops/oopsHierarchy.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/oopsHierarchy.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)oopsHierarchy.hpp 1.31 07/05/17 15:57:10 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/symbolKlass.cpp openjdk/hotspot/src/share/vm/oops/symbolKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/symbolKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/symbolKlass.cpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)symbolKlass.cpp 1.66 07/05/29 09:44:24 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/symbolKlass.hpp openjdk/hotspot/src/share/vm/oops/symbolKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/symbolKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/symbolKlass.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)symbolKlass.hpp 1.42 07/05/29 09:44:24 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -75,4 +72,3 @@ - #endif - const char* internal_name() const; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/symbolOop.cpp openjdk/hotspot/src/share/vm/oops/symbolOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/symbolOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/symbolOop.cpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)symbolOop.cpp 1.28 07/05/05 17:06:08 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/symbolOop.hpp openjdk/hotspot/src/share/vm/oops/symbolOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/symbolOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/symbolOop.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)symbolOop.hpp 1.40 07/05/05 17:06:07 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -119,4 +116,3 @@ - return (((uintptr_t)this < (uintptr_t)other) ? -1 - : ((uintptr_t)this == (uintptr_t) other) ? 0 : 1); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayKlass.cpp openjdk/hotspot/src/share/vm/oops/typeArrayKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/typeArrayKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlass.cpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)typeArrayKlass.cpp 1.125 07/05/29 09:44:24 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayKlass.hpp openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/typeArrayKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)typeArrayKlass.hpp 1.69 07/05/29 09:44:25 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayKlassKlass.cpp openjdk/hotspot/src/share/vm/oops/typeArrayKlassKlass.cpp ---- openjdk6/hotspot/src/share/vm/oops/typeArrayKlassKlass.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlassKlass.cpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)typeArrayKlassKlass.cpp 1.30 07/05/05 17:06:08 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -71,4 +68,3 @@ - const char* typeArrayKlassKlass::internal_name() const { - return "{type array class}"; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/oops/typeArrayKlassKlass.hpp ---- openjdk6/hotspot/src/share/vm/oops/typeArrayKlassKlass.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlassKlass.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)typeArrayKlassKlass.hpp 1.24 07/05/05 17:06:08 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -59,4 +56,3 @@ - public: - const char* internal_name() const; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayOop.cpp openjdk/hotspot/src/share/vm/oops/typeArrayOop.cpp ---- openjdk6/hotspot/src/share/vm/oops/typeArrayOop.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/typeArrayOop.cpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)typeArrayOop.cpp 1.14 07/05/05 17:06:08 JVM" --#endif - /* - * Copyright 1997 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -29,4 +26,3 @@ - # include "incls/_typeArrayOop.cpp.incl" - - // <> -- -diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayOop.hpp openjdk/hotspot/src/share/vm/oops/typeArrayOop.hpp ---- openjdk6/hotspot/src/share/vm/oops/typeArrayOop.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/oops/typeArrayOop.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)typeArrayOop.hpp 1.46 07/05/05 17:06:08 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/addnode.cpp openjdk/hotspot/src/share/vm/opto/addnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/addnode.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)addnode.cpp 1.142 07/10/23 13:12:52 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -611,28 +608,6 @@ - return NULL; - } - --//------------------------------unpack_offsets---------------------------------- --// Collect the AddP offset values into the elements array, giving up --// if there are more than length. --int AddPNode::unpack_offsets(Node* elements[], int length) { -- int count = 0; -- Node* addr = this; -- Node* base = addr->in(AddPNode::Base); -- while (addr->is_AddP()) { -- if (addr->in(AddPNode::Base) != base) { -- // give up -- return -1; -- } -- elements[count++] = addr->in(AddPNode::Offset); -- if (count == length) { -- // give up -- return -1; -- } -- addr = addr->in(AddPNode::Address); -- } -- return count; --} -- - //------------------------------match_edge------------------------------------- - // Do we Match on this edge index or not? Do not match base pointer edge - uint AddPNode::match_edge(uint idx) const { -diff -ruNb openjdk6/hotspot/src/share/vm/opto/addnode.hpp openjdk/hotspot/src/share/vm/opto/addnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/addnode.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/addnode.hpp 2008-12-05 16:41:22.067636550 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)addnode.hpp 1.59 07/10/23 13:12:52 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -147,11 +144,6 @@ - static Node* Ideal_base_and_offset(Node* ptr, PhaseTransform* phase, - // second return value: - intptr_t& offset); -- -- // Collect the AddP offset values into the elements array, giving up -- // if there are more than length. -- int unpack_offsets(Node* elements[], int length); -- - // Do not match base-ptr edge - virtual uint match_edge(uint idx) const; - static const Type *mach_bottom_type(const MachNode* n); // used by ad_.hpp -diff -ruNb openjdk6/hotspot/src/share/vm/opto/adlcVMDeps.hpp openjdk/hotspot/src/share/vm/opto/adlcVMDeps.hpp ---- openjdk6/hotspot/src/share/vm/opto/adlcVMDeps.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/adlcVMDeps.hpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)adlcVMDeps.hpp 1.19 07/05/05 17:06:10 JVM" --#endif - /* - * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/block.cpp openjdk/hotspot/src/share/vm/opto/block.cpp ---- openjdk6/hotspot/src/share/vm/opto/block.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/block.cpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)block.cpp 1.172 07/09/28 10:23:15 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/block.hpp openjdk/hotspot/src/share/vm/opto/block.hpp ---- openjdk6/hotspot/src/share/vm/opto/block.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/block.hpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)block.hpp 1.102 07/09/25 09:22:14 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/buildOopMap.cpp openjdk/hotspot/src/share/vm/opto/buildOopMap.cpp ---- openjdk6/hotspot/src/share/vm/opto/buildOopMap.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/buildOopMap.cpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)buildOopMap.cpp 1.37 07/05/05 17:06:11 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/bytecodeInfo.cpp openjdk/hotspot/src/share/vm/opto/bytecodeInfo.cpp ---- openjdk6/hotspot/src/share/vm/opto/bytecodeInfo.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/bytecodeInfo.cpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bytecodeInfo.cpp 1.122 07/05/05 17:06:12 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/c2_globals.cpp openjdk/hotspot/src/share/vm/opto/c2_globals.cpp ---- openjdk6/hotspot/src/share/vm/opto/c2_globals.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/c2_globals.cpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c2_globals.cpp 1.14 07/05/17 15:57:19 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/c2_globals.hpp openjdk/hotspot/src/share/vm/opto/c2_globals.hpp ---- openjdk6/hotspot/src/share/vm/opto/c2_globals.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/c2_globals.hpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c2_globals.hpp 1.96 07/10/23 13:12:52 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -370,12 +367,6 @@ - notproduct(bool, PrintEliminateLocks, false, \ - "Print out when locks are eliminated") \ - \ -- diagnostic(bool, EliminateAutoBox, false, \ -- "Private flag to control optimizations for autobox elimination") \ -- \ -- product(intx, AutoBoxCacheMax, 128, \ -- "Sets max value cached by the java.lang.Integer autobox cache") \ -- \ - product(bool, DoEscapeAnalysis, false, \ - "Perform escape analysis") \ - \ -@@ -389,4 +380,3 @@ - "Maximum times call Label_Root to prevent stack overflow") \ - - C2_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG) -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/c2compiler.cpp openjdk/hotspot/src/share/vm/opto/c2compiler.cpp ---- openjdk6/hotspot/src/share/vm/opto/c2compiler.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/c2compiler.cpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)c2compiler.cpp 1.29 07/05/05 17:06:11 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/c2compiler.hpp openjdk/hotspot/src/share/vm/opto/c2compiler.hpp ---- openjdk6/hotspot/src/share/vm/opto/c2compiler.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/c2compiler.hpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c2compiler.hpp 1.28 07/05/05 17:06:11 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -57,10 +54,3 @@ - // Print compilation timers and statistics - void print_timers(); - }; -- -- -- -- -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/callGenerator.cpp openjdk/hotspot/src/share/vm/opto/callGenerator.cpp ---- openjdk6/hotspot/src/share/vm/opto/callGenerator.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/callGenerator.cpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)callGenerator.cpp 1.49 07/08/07 15:24:21 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/callGenerator.hpp openjdk/hotspot/src/share/vm/opto/callGenerator.hpp ---- openjdk6/hotspot/src/share/vm/opto/callGenerator.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/callGenerator.hpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)callGenerator.hpp 1.19 07/05/05 17:06:12 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/callnode.cpp openjdk/hotspot/src/share/vm/opto/callnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/callnode.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/callnode.cpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)callnode.cpp 1.238 07/10/04 14:36:00 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/callnode.hpp openjdk/hotspot/src/share/vm/opto/callnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/callnode.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/callnode.hpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)callnode.hpp 1.195 07/10/04 14:36:00 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/cfgnode.cpp openjdk/hotspot/src/share/vm/opto/cfgnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/cfgnode.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp 2008-12-05 16:41:22.077636701 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)cfgnode.cpp 1.262 08/11/24 12:22:57 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1558,6 +1555,64 @@ - if (opt != NULL) return opt; - } - -+ if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) { -+ // Try to undo Phi of AddP: -+ // (Phi (AddP base base y) (AddP base2 base2 y)) -+ // becomes: -+ // newbase := (Phi base base2) -+ // (AddP newbase newbase y) -+ // -+ // This occurs as a result of unsuccessful split_thru_phi and -+ // interferes with taking advantage of addressing modes. See the -+ // clone_shift_expressions code in matcher.cpp -+ Node* addp = in(1); -+ const Type* type = addp->in(AddPNode::Base)->bottom_type(); -+ Node* y = addp->in(AddPNode::Offset); -+ if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) { -+ // make sure that all the inputs are similar to the first one, -+ // i.e. AddP with base == address and same offset as first AddP -+ bool doit = true; -+ for (uint i = 2; i < req(); i++) { -+ if (in(i) == NULL || -+ in(i)->Opcode() != Op_AddP || -+ in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) || -+ in(i)->in(AddPNode::Offset) != y) { -+ doit = false; -+ break; -+ } -+ // Accumulate type for resulting Phi -+ type = type->meet(in(i)->in(AddPNode::Base)->bottom_type()); -+ } -+ Node* base = NULL; -+ if (doit) { -+ // Check for neighboring AddP nodes in a tree. -+ // If they have a base, use that it. -+ for (DUIterator_Fast kmax, k = this->fast_outs(kmax); k < kmax; k++) { -+ Node* u = this->fast_out(k); -+ if (u->is_AddP()) { -+ Node* base2 = u->in(AddPNode::Base); -+ if (base2 != NULL && !base2->is_top()) { -+ if (base == NULL) -+ base = base2; -+ else if (base != base2) -+ { doit = false; break; } -+ } -+ } -+ } -+ } -+ if (doit) { -+ if (base == NULL) { -+ base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL); -+ for (uint i = 1; i < req(); i++) { -+ base->init_req(i, in(i)->in(AddPNode::Base)); -+ } -+ phase->is_IterGVN()->register_new_node_with_optimizer(base); -+ } -+ return new (phase->C, 4) AddPNode(base, base, y); -+ } -+ } -+ } -+ - // Split phis through memory merges, so that the memory merges will go away. - // Piggy-back this transformation on the search for a unique input.... - // It will be as if the merged memory is the unique value of the phi. -@@ -1897,4 +1952,3 @@ - st->print("%s", Name()); - } - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/cfgnode.hpp openjdk/hotspot/src/share/vm/opto/cfgnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/cfgnode.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/cfgnode.hpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)cfgnode.hpp 1.117 07/10/23 13:12:52 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -313,14 +310,8 @@ - virtual const RegMask &out_RegMask() const; - void dominated_by(Node* prev_dom, PhaseIterGVN* igvn); - int is_range_check(Node* &range, Node* &index, jint &offset); -- Node* fold_compares(PhaseGVN* phase); - static Node* up_one_dom(Node* curr, bool linear_only = false); - -- // Takes the type of val and filters it through the test represented -- // by if_proj and returns a more refined type if one is produced. -- // Returns NULL is it couldn't improve the type. -- static const TypeInt* filtered_int_type(PhaseGVN* phase, Node* val, Node* if_proj); -- - #ifndef PRODUCT - virtual void dump_spec(outputStream *st) const; - #endif -@@ -488,4 +479,3 @@ - virtual void format( PhaseRegAlloc *, outputStream *st ) const; - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/chaitin.cpp openjdk/hotspot/src/share/vm/opto/chaitin.cpp ---- openjdk6/hotspot/src/share/vm/opto/chaitin.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/chaitin.cpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)chaitin.cpp 1.116 07/09/28 10:23:12 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -46,7 +43,7 @@ - if( _degree_valid ) tty->print( "%d ", _eff_degree ); - else tty->print("? "); - -- if( is_multidef() ) { -+ if( _def == NodeSentinel ) { - tty->print("MultiDef "); - if (_defs != NULL) { - tty->print("("); -@@ -767,7 +764,7 @@ - // if the LRG is an unaligned pair, we will have to spill - // so clear the LRG's register mask if it is not already spilled - if ( !n->is_SpillCopy() && -- (lrg._def == NULL || lrg.is_multidef() || !lrg._def->is_SpillCopy()) && -+ (lrg._def == NULL || lrg._def == NodeSentinel || !lrg._def->is_SpillCopy()) && - lrgmask.is_misaligned_Pair()) { - lrg.Clear(); - } -@@ -1284,7 +1281,7 @@ - // Live range is live and no colors available - else { - assert( lrg->alive(), "" ); -- assert( !lrg->_fat_proj || lrg->is_multidef() || -+ assert( !lrg->_fat_proj || lrg->_def == NodeSentinel || - lrg->_def->outcnt() > 0, "fat_proj cannot spill"); - assert( !orig_mask.is_AllStack(), "All Stack does not spill" ); - -diff -ruNb openjdk6/hotspot/src/share/vm/opto/chaitin.hpp openjdk/hotspot/src/share/vm/opto/chaitin.hpp ---- openjdk6/hotspot/src/share/vm/opto/chaitin.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/chaitin.hpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)chaitin.hpp 1.161 08/03/26 10:13:00 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -159,8 +156,6 @@ - - // Alive if non-zero, dead if zero - bool alive() const { return _def != NULL; } -- bool is_multidef() const { return _def == NodeSentinel; } -- bool is_singledef() const { return _def != NodeSentinel; } - - #ifndef PRODUCT - void dump( ) const; -@@ -325,8 +320,7 @@ - uint split_DEF( Node *def, Block *b, int loc, uint max, Node **Reachblock, Node **debug_defs, GrowableArray splits, int slidx ); - uint split_USE( Node *def, Block *b, Node *use, uint useidx, uint max, bool def_down, bool cisc_sp, GrowableArray splits, int slidx ); - int clone_projs( Block *b, uint idx, Node *con, Node *copy, uint &maxlrg ); -- Node *split_Rematerialize(Node *def, Block *b, uint insidx, uint &maxlrg, GrowableArray splits, -- int slidx, uint *lrg2reach, Node **Reachblock, bool walkThru); -+ Node *split_Rematerialize( Node *def, Block *b, uint insidx, uint &maxlrg, GrowableArray splits, int slidx, uint *lrg2reach, Node **Reachblock, bool walkThru ); - // True if lidx is used before any real register is def'd in the block - bool prompt_use( Block *b, uint lidx ); - Node *get_spillcopy_wide( Node *def, Node *use, uint uidx ); -@@ -463,8 +457,7 @@ - bool may_be_copy_of_callee( Node *def ) const; - - // If nreg already contains the same constant as val then eliminate it -- bool eliminate_copy_of_constant(Node* val, Node* n, -- Block *current_block, Node_List& value, Node_List ®nd, -+ bool eliminate_copy_of_constant(Node* val, Block *current_block, Node_List& value, Node_List ®nd, - OptoReg::Name nreg, OptoReg::Name nreg2); - // Extend the node to LRG mapping - void add_reference( const Node *node, const Node *old_node); -diff -ruNb openjdk6/hotspot/src/share/vm/opto/classes.cpp openjdk/hotspot/src/share/vm/opto/classes.cpp ---- openjdk6/hotspot/src/share/vm/opto/classes.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/classes.cpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)classes.cpp 1.31 07/05/05 17:06:12 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -35,4 +32,3 @@ - #define macro(x) int x##Node::Opcode() const { return Op_##x; } - #include "classes.hpp" - #undef macro -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/classes.hpp openjdk/hotspot/src/share/vm/opto/classes.hpp ---- openjdk6/hotspot/src/share/vm/opto/classes.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/classes.hpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)classes.hpp 1.178 07/07/19 19:08:27 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/coalesce.cpp openjdk/hotspot/src/share/vm/opto/coalesce.cpp ---- openjdk6/hotspot/src/share/vm/opto/coalesce.cpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/coalesce.cpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)coalesce.cpp 1.196 07/09/28 10:23:11 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -607,8 +604,8 @@ - // If both are single def, then src_def powers one live range - // and def_copy powers the other. After merging, src_def powers - // the combined live range. -- lrgs(lr1)._def = (lrgs(lr1).is_multidef() || -- lrgs(lr2).is_multidef() ) -+ lrgs(lr1)._def = (lrgs(lr1)._def == NodeSentinel || -+ lrgs(lr2)._def == NodeSentinel ) - ? NodeSentinel : src_def; - lrgs(lr2)._def = NULL; // No def for lrg 2 - lrgs(lr2).Clear(); // Force empty mask for LRG 2 -@@ -916,4 +913,3 @@ - */ - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/coalesce.hpp openjdk/hotspot/src/share/vm/opto/coalesce.hpp ---- openjdk6/hotspot/src/share/vm/opto/coalesce.hpp 2008-11-25 10:12:09.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/coalesce.hpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)coalesce.hpp 1.44 07/05/05 17:06:14 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -110,4 +107,3 @@ - - void update_ifg(uint lr1, uint lr2, IndexSet *n_lr1, IndexSet *n_lr2); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/compile.cpp openjdk/hotspot/src/share/vm/opto/compile.cpp ---- openjdk6/hotspot/src/share/vm/opto/compile.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/compile.cpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compile.cpp 1.633 07/09/28 10:23:11 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/compile.hpp openjdk/hotspot/src/share/vm/opto/compile.hpp ---- openjdk6/hotspot/src/share/vm/opto/compile.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/compile.hpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compile.hpp 1.232 07/09/28 10:23:10 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/connode.cpp openjdk/hotspot/src/share/vm/opto/connode.cpp ---- openjdk6/hotspot/src/share/vm/opto/connode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/connode.cpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)connode.cpp 1.222 07/10/16 13:32:21 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/connode.hpp openjdk/hotspot/src/share/vm/opto/connode.hpp ---- openjdk6/hotspot/src/share/vm/opto/connode.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/connode.hpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)connode.hpp 1.160 07/05/05 17:06:13 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/divnode.cpp openjdk/hotspot/src/share/vm/opto/divnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/divnode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/divnode.cpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)divnode.cpp 1.88 07/05/05 17:06:13 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/divnode.hpp openjdk/hotspot/src/share/vm/opto/divnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/divnode.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/divnode.hpp 2008-12-05 16:41:22.087636851 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)divnode.hpp 1.31 07/05/05 17:06:16 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -178,4 +175,3 @@ - // Make a divmod and associated projections from a div or mod. - static DivModLNode* make(Compile* C, Node* div_or_mod); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/doCall.cpp openjdk/hotspot/src/share/vm/opto/doCall.cpp ---- openjdk6/hotspot/src/share/vm/opto/doCall.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/doCall.cpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)doCall.cpp 1.207 07/07/19 19:08:29 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/domgraph.cpp openjdk/hotspot/src/share/vm/opto/domgraph.cpp ---- openjdk6/hotspot/src/share/vm/opto/domgraph.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/domgraph.cpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)domgraph.cpp 1.76 07/07/11 15:38:57 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -665,4 +662,3 @@ - - } - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/escape.cpp openjdk/hotspot/src/share/vm/opto/escape.cpp ---- openjdk6/hotspot/src/share/vm/opto/escape.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/escape.cpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)escape.cpp 1.10 07/05/17 15:58:23 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/escape.hpp openjdk/hotspot/src/share/vm/opto/escape.hpp ---- openjdk6/hotspot/src/share/vm/opto/escape.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/escape.hpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)escape.hpp 1.9 07/05/17 15:58:25 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -320,4 +317,3 @@ - void dump(); - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/gcm.cpp openjdk/hotspot/src/share/vm/opto/gcm.cpp ---- openjdk6/hotspot/src/share/vm/opto/gcm.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/gcm.cpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)gcm.cpp 1.259 08/07/10 14:40:09 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -310,6 +307,7 @@ - - // Test and set the visited bit. - if (mid->raise_LCA_visited() == mark) continue; // already visited -+ mid->set_raise_LCA_visited(mark); - - // Don't process the current LCA, otherwise the search may terminate early - if (mid != LCA && mid->raise_LCA_mark() == mark) { -@@ -319,8 +317,6 @@ - assert(early->dominates(LCA), "early is high enough"); - // Resume searching at that point, skipping intermediate levels. - worklist.push(LCA); -- if (LCA == mid) -- continue; // Don't mark as visited to avoid early termination. - } else { - // Keep searching through this block's predecessors. - for (uint j = 1, jmax = mid->num_preds(); j < jmax; j++) { -@@ -328,7 +324,6 @@ - worklist.push(mid_parent); - } - } -- mid->set_raise_LCA_visited(mark); - } - return LCA; - } -diff -ruNb openjdk6/hotspot/src/share/vm/opto/generateOptoStub.cpp openjdk/hotspot/src/share/vm/opto/generateOptoStub.cpp ---- openjdk6/hotspot/src/share/vm/opto/generateOptoStub.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/generateOptoStub.cpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)generateOptoStub.cpp 1.101 07/05/05 17:06:17 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -292,4 +289,3 @@ - } - root()->add_req(_gvn.transform(ret)); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/graphKit.cpp openjdk/hotspot/src/share/vm/opto/graphKit.cpp ---- openjdk6/hotspot/src/share/vm/opto/graphKit.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/graphKit.cpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)graphKit.cpp 1.132 07/10/04 14:36:00 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/graphKit.hpp openjdk/hotspot/src/share/vm/opto/graphKit.hpp ---- openjdk6/hotspot/src/share/vm/opto/graphKit.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/graphKit.hpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)graphKit.hpp 1.59 07/08/07 15:24:25 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -721,4 +718,3 @@ - BuildCutout(GraphKit* kit, Node* p, float prob, float cnt = COUNT_UNKNOWN); - ~BuildCutout(); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/idealGraphPrinter.cpp openjdk/hotspot/src/share/vm/opto/idealGraphPrinter.cpp ---- openjdk6/hotspot/src/share/vm/opto/idealGraphPrinter.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/idealGraphPrinter.cpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)idealGraphPrinter.cpp 1.2 07/10/02 11:32:04 JVM" --#endif - /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/idealGraphPrinter.hpp openjdk/hotspot/src/share/vm/opto/idealGraphPrinter.hpp ---- openjdk6/hotspot/src/share/vm/opto/idealGraphPrinter.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/idealGraphPrinter.hpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)idealGraphPrinter.hpp 1.1 07/09/28 11:48:37 JVM" --#endif - /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/idealKit.cpp openjdk/hotspot/src/share/vm/opto/idealKit.cpp ---- openjdk6/hotspot/src/share/vm/opto/idealKit.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/idealKit.cpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)idealKit.cpp 1.8 07/06/18 14:25:26 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/idealKit.hpp openjdk/hotspot/src/share/vm/opto/idealKit.hpp ---- openjdk6/hotspot/src/share/vm/opto/idealKit.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/idealKit.hpp 2008-12-05 16:41:22.097637002 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)idealKit.hpp 1.8 07/06/18 14:25:26 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/ifg.cpp openjdk/hotspot/src/share/vm/opto/ifg.cpp ---- openjdk6/hotspot/src/share/vm/opto/ifg.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/ifg.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ifg.cpp 1.62 07/05/05 17:06:13 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -597,7 +594,7 @@ - - // Insure high score for immediate-use spill copies so they get a color - if( n->is_SpillCopy() -- && lrgs(r).is_singledef() // MultiDef live range can still split -+ && lrgs(r)._def != NodeSentinel // MultiDef live range can still split - && n->outcnt() == 1 // and use must be in this block - && _cfg._bbs[n->unique_out()->_idx] == b ) { - // All single-use MachSpillCopy(s) that immediately precede their -@@ -814,4 +811,3 @@ - - return must_spill; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/ifnode.cpp openjdk/hotspot/src/share/vm/opto/ifnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/ifnode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/ifnode.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ifnode.cpp 1.63 07/10/23 13:12:51 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -546,159 +543,6 @@ - return NULL; // Dead loop? Or hit root? - } - -- --//------------------------------filtered_int_type-------------------------------- --// Return a possibly more restrictive type for val based on condition control flow for an if --const TypeInt* IfNode::filtered_int_type(PhaseGVN* gvn, Node *val, Node* if_proj) { -- assert(if_proj && -- (if_proj->Opcode() == Op_IfTrue || if_proj->Opcode() == Op_IfFalse), "expecting an if projection"); -- if (if_proj->in(0) && if_proj->in(0)->is_If()) { -- IfNode* iff = if_proj->in(0)->as_If(); -- if (iff->in(1) && iff->in(1)->is_Bool()) { -- BoolNode* bol = iff->in(1)->as_Bool(); -- if (bol->in(1) && bol->in(1)->is_Cmp()) { -- const CmpNode* cmp = bol->in(1)->as_Cmp(); -- if (cmp->in(1) == val) { -- const TypeInt* cmp2_t = gvn->type(cmp->in(2))->isa_int(); -- if (cmp2_t != NULL) { -- jint lo = cmp2_t->_lo; -- jint hi = cmp2_t->_hi; -- BoolTest::mask msk = if_proj->Opcode() == Op_IfTrue ? bol->_test._test : bol->_test.negate(); -- switch (msk) { -- case BoolTest::ne: -- // Can't refine type -- return NULL; -- case BoolTest::eq: -- return cmp2_t; -- case BoolTest::lt: -- lo = TypeInt::INT->_lo; -- if (hi - 1 < hi) { -- hi = hi - 1; -- } -- break; -- case BoolTest::le: -- lo = TypeInt::INT->_lo; -- break; -- case BoolTest::gt: -- if (lo + 1 > lo) { -- lo = lo + 1; -- } -- hi = TypeInt::INT->_hi; -- break; -- case BoolTest::ge: -- // lo unchanged -- hi = TypeInt::INT->_hi; -- break; -- } -- const TypeInt* rtn_t = TypeInt::make(lo, hi, cmp2_t->_widen); -- return rtn_t; -- } -- } -- } -- } -- } -- return NULL; --} -- --//------------------------------fold_compares---------------------------- --// See if a pair of CmpIs can be converted into a CmpU. In some cases --// the direction of this if is determined by the preciding if so it --// can be eliminate entirely. Given an if testing (CmpI n c) check --// for an immediately control dependent if that is testing (CmpI n c2) --// and has one projection leading to this if and the other projection --// leading to a region that merges one of this ifs control --// projections. --// --// If --// / | --// / | --// / | --// If | --// /\ | --// / \ | --// / \ | --// / Region --// --Node* IfNode::fold_compares(PhaseGVN* phase) { -- if (!EliminateAutoBox || Opcode() != Op_If) return NULL; -- -- Node* this_cmp = in(1)->in(1); -- if (this_cmp != NULL && this_cmp->Opcode() == Op_CmpI && -- this_cmp->in(2)->is_Con() && this_cmp->in(2) != phase->C->top()) { -- Node* ctrl = in(0); -- BoolNode* this_bool = in(1)->as_Bool(); -- Node* n = this_cmp->in(1); -- int hi = this_cmp->in(2)->get_int(); -- if (ctrl != NULL && ctrl->is_Proj() && ctrl->outcnt() == 1 && -- ctrl->in(0)->is_If() && -- ctrl->in(0)->outcnt() == 2 && -- ctrl->in(0)->in(1)->is_Bool() && -- ctrl->in(0)->in(1)->in(1)->Opcode() == Op_CmpI && -- ctrl->in(0)->in(1)->in(1)->in(2)->is_Con() && -- ctrl->in(0)->in(1)->in(1)->in(1) == n) { -- IfNode* dom_iff = ctrl->in(0)->as_If(); -- Node* otherproj = dom_iff->proj_out(!ctrl->as_Proj()->_con); -- if (otherproj->outcnt() == 1 && otherproj->unique_out()->is_Region() && -- this_bool->_test._test != BoolTest::ne && this_bool->_test._test != BoolTest::eq) { -- // Identify which proj goes to the region and which continues on -- RegionNode* region = otherproj->unique_out()->as_Region(); -- Node* success = NULL; -- Node* fail = NULL; -- for (int i = 0; i < 2; i++) { -- Node* proj = proj_out(i); -- if (success == NULL && proj->outcnt() == 1 && proj->unique_out() == region) { -- success = proj; -- } else if (fail == NULL) { -- fail = proj; -- } else { -- success = fail = NULL; -- } -- } -- if (success != NULL && fail != NULL && !region->has_phi()) { -- int lo = dom_iff->in(1)->in(1)->in(2)->get_int(); -- BoolNode* dom_bool = dom_iff->in(1)->as_Bool(); -- Node* dom_cmp = dom_bool->in(1); -- const TypeInt* failtype = filtered_int_type(phase, n, ctrl); -- if (failtype != NULL) { -- const TypeInt* type2 = filtered_int_type(phase, n, fail); -- if (type2 != NULL) { -- failtype = failtype->join(type2)->is_int(); -- } else { -- failtype = NULL; -- } -- } -- -- if (failtype != NULL && -- dom_bool->_test._test != BoolTest::ne && dom_bool->_test._test != BoolTest::eq) { -- int bound = failtype->_hi - failtype->_lo + 1; -- if (failtype->_hi != max_jint && failtype->_lo != min_jint && bound > 1) { -- // Merge the two compares into a single unsigned compare by building (CmpU (n - lo) hi) -- BoolTest::mask cond = fail->as_Proj()->_con ? BoolTest::lt : BoolTest::ge; -- Node* adjusted = phase->transform(new (phase->C, 3) SubINode(n, phase->intcon(failtype->_lo))); -- Node* newcmp = phase->transform(new (phase->C, 3) CmpUNode(adjusted, phase->intcon(bound))); -- Node* newbool = phase->transform(new (phase->C, 2) BoolNode(newcmp, cond)); -- phase->hash_delete(dom_iff); -- dom_iff->set_req(1, phase->intcon(ctrl->as_Proj()->_con)); -- phase->is_IterGVN()->_worklist.push(dom_iff); -- phase->hash_delete(this); -- set_req(1, newbool); -- return this; -- } -- if (failtype->_lo > failtype->_hi) { -- // previous if determines the result of this if so -- // replace Bool with constant -- phase->hash_delete(this); -- set_req(1, phase->intcon(success->as_Proj()->_con)); -- return this; -- } -- } -- } -- } -- } -- } -- return NULL; --} -- - //------------------------------remove_useless_bool---------------------------- - // Check for people making a useless boolean: things like - // if( (x < y ? true : false) ) { ... } -@@ -900,11 +744,6 @@ - // Normal equivalent-test check. - if( !dom ) return NULL; // Dead loop? - -- Node* result = fold_compares(phase); -- if (result != NULL) { -- return result; -- } -- - // Search up the dominator tree for an If with an identical test - while( dom->Opcode() != op || // Not same opcode? - dom->in(1) != in(1) || // Not same input 1? -@@ -1081,4 +920,3 @@ - ? in(0)->in(0) // IfNode control - : this; // no progress - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/indexSet.cpp openjdk/hotspot/src/share/vm/opto/indexSet.cpp ---- openjdk6/hotspot/src/share/vm/opto/indexSet.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/indexSet.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)indexSet.cpp 1.24 07/05/05 17:06:16 JVM" --#endif - /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/indexSet.hpp openjdk/hotspot/src/share/vm/opto/indexSet.hpp ---- openjdk6/hotspot/src/share/vm/opto/indexSet.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/indexSet.hpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)indexSet.hpp 1.29 07/05/05 17:06:18 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/lcm.cpp openjdk/hotspot/src/share/vm/opto/lcm.cpp ---- openjdk6/hotspot/src/share/vm/opto/lcm.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/lcm.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)lcm.cpp 1.102 07/05/17 15:58:55 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -935,7 +932,3 @@ - } - } - } -- -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/library_call.cpp openjdk/hotspot/src/share/vm/opto/library_call.cpp ---- openjdk6/hotspot/src/share/vm/opto/library_call.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/library_call.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)library_call.cpp 1.167 07/07/25 17:43:16 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -4922,4 +4919,3 @@ - copyfunc_addr, copyfunc_name, adr_type, - src_start, dest_start, copy_length XTOP); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/live.cpp openjdk/hotspot/src/share/vm/opto/live.cpp ---- openjdk6/hotspot/src/share/vm/opto/live.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/live.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)live.cpp 1.70 07/05/17 17:44:00 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/live.hpp openjdk/hotspot/src/share/vm/opto/live.hpp ---- openjdk6/hotspot/src/share/vm/opto/live.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/live.hpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)live.hpp 1.43 07/05/05 17:06:19 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/locknode.cpp openjdk/hotspot/src/share/vm/opto/locknode.cpp ---- openjdk6/hotspot/src/share/vm/opto/locknode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/locknode.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)locknode.cpp 1.49 07/05/17 15:59:05 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -123,6 +120,3 @@ - // for a null check on Unlock. - shared_unlock(map()->peek_monitor_box(), map()->peek_monitor_obj()); - } -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/locknode.hpp openjdk/hotspot/src/share/vm/opto/locknode.hpp ---- openjdk6/hotspot/src/share/vm/opto/locknode.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/locknode.hpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)locknode.hpp 1.40 07/09/28 10:23:10 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -98,4 +95,3 @@ - const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;} - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopTransform.cpp openjdk/hotspot/src/share/vm/opto/loopTransform.cpp ---- openjdk6/hotspot/src/share/vm/opto/loopTransform.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/loopTransform.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)loopTransform.cpp 1.116 07/06/01 11:35:03 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopUnswitch.cpp openjdk/hotspot/src/share/vm/opto/loopUnswitch.cpp ---- openjdk6/hotspot/src/share/vm/opto/loopUnswitch.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/loopUnswitch.cpp 2008-12-05 16:41:22.107637153 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)loopUnswitch.cpp 1.6 07/06/29 14:41:32 JVM" --#endif - /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/loopnode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)loopnode.cpp 1.262 07/10/23 13:12:50 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -654,7 +651,7 @@ - while (if_cnt < if_limit) { - if ((pred->Opcode() == Op_IfTrue || pred->Opcode() == Op_IfFalse)) { - if_cnt++; -- const TypeInt* if_t = IfNode::filtered_int_type(&_igvn, val, pred); -+ const TypeInt* if_t = filtered_type_at_if(val, pred); - if (if_t != NULL) { - if (rtn_t == NULL) { - rtn_t = if_t; -@@ -677,6 +674,59 @@ - } - - -+//------------------------------filtered_type_at_if-------------------------------- -+// Return a possibly more restrictive type for val based on condition control flow for an if -+const TypeInt* PhaseIdealLoop::filtered_type_at_if( Node* val, Node *if_proj) { -+ assert(if_proj && -+ (if_proj->Opcode() == Op_IfTrue || if_proj->Opcode() == Op_IfFalse), "expecting an if projection"); -+ if (if_proj->in(0) && if_proj->in(0)->is_If()) { -+ IfNode* iff = if_proj->in(0)->as_If(); -+ if (iff->in(1) && iff->in(1)->is_Bool()) { -+ BoolNode* bol = iff->in(1)->as_Bool(); -+ if (bol->in(1) && bol->in(1)->is_Cmp()) { -+ const CmpNode* cmp = bol->in(1)->as_Cmp(); -+ if (cmp->in(1) == val) { -+ const TypeInt* cmp2_t = _igvn.type(cmp->in(2))->isa_int(); -+ if (cmp2_t != NULL) { -+ jint lo = cmp2_t->_lo; -+ jint hi = cmp2_t->_hi; -+ BoolTest::mask msk = if_proj->Opcode() == Op_IfTrue ? bol->_test._test : bol->_test.negate(); -+ switch (msk) { -+ case BoolTest::ne: -+ // Can't refine type -+ return NULL; -+ case BoolTest::eq: -+ return cmp2_t; -+ case BoolTest::lt: -+ lo = TypeInt::INT->_lo; -+ if (hi - 1 < hi) { -+ hi = hi - 1; -+ } -+ break; -+ case BoolTest::le: -+ lo = TypeInt::INT->_lo; -+ break; -+ case BoolTest::gt: -+ if (lo + 1 > lo) { -+ lo = lo + 1; -+ } -+ hi = TypeInt::INT->_hi; -+ break; -+ case BoolTest::ge: -+ // lo unchanged -+ hi = TypeInt::INT->_hi; -+ break; -+ } -+ const TypeInt* rtn_t = TypeInt::make(lo, hi, cmp2_t->_widen); -+ return rtn_t; -+ } -+ } -+ } -+ } -+ } -+ return NULL; -+} -+ - //------------------------------dump_spec-------------------------------------- - // Dump special per-node info - #ifndef PRODUCT -@@ -2834,4 +2884,3 @@ - } - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopnode.hpp openjdk/hotspot/src/share/vm/opto/loopnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/loopnode.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/loopnode.hpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)loopnode.hpp 1.146 07/10/23 13:12:55 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -853,6 +850,7 @@ - const TypeInt* filtered_type( Node *n ) { return filtered_type(n, NULL); } - // Helpers for filtered type - const TypeInt* filtered_type_from_dominators( Node* val, Node *val_ctrl); -+ const TypeInt* filtered_type_at_if( Node* val, Node *if_proj); - - // Helper functions - void register_new_node( Node *n, Node *blk ); -@@ -919,4 +917,3 @@ - - IdealLoopTree* current() { return _curnt; } // Return current value of iterator. - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopopts.cpp openjdk/hotspot/src/share/vm/opto/loopopts.cpp ---- openjdk6/hotspot/src/share/vm/opto/loopopts.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/loopopts.cpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)loopopts.cpp 1.222 08/11/24 12:23:09 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -32,11 +29,6 @@ - //------------------------------split_thru_phi--------------------------------- - // Split Node 'n' through merge point if there is enough win. - Node *PhaseIdealLoop::split_thru_phi( Node *n, Node *region, int policy ) { -- if (n->Opcode() == Op_ConvI2L && n->bottom_type() != TypeLong::BOTTOM) { -- // ConvI2L may have type information on it which is unsafe to push up -- // so disable this for now -- return NULL; -- } - int wins = 0; - assert( !n->is_CFG(), "" ); - assert( region->is_Region(), "" ); -@@ -2683,4 +2675,3 @@ - } - - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/machnode.cpp openjdk/hotspot/src/share/vm/opto/machnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/machnode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/machnode.cpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)machnode.cpp 1.200 07/09/28 10:23:08 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/machnode.hpp openjdk/hotspot/src/share/vm/opto/machnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/machnode.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/machnode.hpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)machnode.hpp 1.204 07/09/28 10:23:08 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/macro.cpp openjdk/hotspot/src/share/vm/opto/macro.cpp ---- openjdk6/hotspot/src/share/vm/opto/macro.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/macro.cpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)macro.cpp 1.33 07/10/04 14:36:00 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -996,4 +993,3 @@ - _igvn.optimize(); - return false; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/macro.hpp openjdk/hotspot/src/share/vm/opto/macro.hpp ---- openjdk6/hotspot/src/share/vm/opto/macro.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/macro.hpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)macro.hpp 1.11 07/07/19 19:08:26 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/matcher.cpp openjdk/hotspot/src/share/vm/opto/matcher.cpp ---- openjdk6/hotspot/src/share/vm/opto/matcher.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/matcher.cpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)matcher.cpp 1.388 07/09/28 10:33:13 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -2124,4 +2121,3 @@ - _kids[i]->dump(depth+1); - } - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/matcher.hpp openjdk/hotspot/src/share/vm/opto/matcher.hpp ---- openjdk6/hotspot/src/share/vm/opto/matcher.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/matcher.hpp 2008-12-05 16:41:22.117637304 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)matcher.hpp 1.188 07/07/19 19:08:27 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/memnode.cpp openjdk/hotspot/src/share/vm/opto/memnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/memnode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/memnode.cpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,8 +1,5 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)memnode.cpp 1.239 08/11/24 12:23:43 JVM" --#endif - /* -- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -637,46 +634,6 @@ - Node* MemNode::can_see_stored_value(Node* st, PhaseTransform* phase) const { - Node* ld_adr = in(MemNode::Address); - -- const TypeInstPtr* tp = phase->type(ld_adr)->isa_instptr(); -- Compile::AliasType* atp = tp != NULL ? phase->C->alias_type(tp) : NULL; -- if (EliminateAutoBox && atp != NULL && atp->index() >= Compile::AliasIdxRaw && -- atp->field() != NULL && !atp->field()->is_volatile()) { -- uint alias_idx = atp->index(); -- bool final = atp->field()->is_final(); -- Node* result = NULL; -- Node* current = st; -- // Skip through chains of MemBarNodes checking the MergeMems for -- // new states for the slice of this load. Stop once any other -- // kind of node is encountered. Loads from final memory can skip -- // through any kind of MemBar but normal loads shouldn't skip -- // through MemBarAcquire since the could allow them to move out of -- // a synchronized region. -- while (current->is_Proj()) { -- int opc = current->in(0)->Opcode(); -- if ((final && opc == Op_MemBarAcquire) || -- opc == Op_MemBarRelease || opc == Op_MemBarCPUOrder) { -- Node* mem = current->in(0)->in(TypeFunc::Memory); -- if (mem->is_MergeMem()) { -- MergeMemNode* merge = mem->as_MergeMem(); -- Node* new_st = merge->memory_at(alias_idx); -- if (new_st == merge->base_memory()) { -- // Keep searching -- current = merge->base_memory(); -- continue; -- } -- // Save the new memory state for the slice and fall through -- // to exit. -- result = new_st; -- } -- } -- break; -- } -- if (result != NULL) { -- st = result; -- } -- } -- -- - // Loop around twice in the case Load -> Initialize -> Store. - // (See PhaseIterGVN::add_users_to_worklist, which knows about this case.) - for (int trip = 0; trip <= 1; trip++) { -@@ -766,168 +723,6 @@ - return this; - } - -- --// Returns true if the AliasType refers to the field that holds the --// cached box array. Currently only handles the IntegerCache case. --static bool is_autobox_cache(Compile::AliasType* atp) { -- if (atp != NULL && atp->field() != NULL) { -- ciField* field = atp->field(); -- ciSymbol* klass = field->holder()->name(); -- if (field->name() == ciSymbol::cache_field_name() && -- field->holder()->uses_default_loader() && -- klass == ciSymbol::java_lang_Integer_IntegerCache()) { -- return true; -- } -- } -- return false; --} -- --// Fetch the base value in the autobox array --static bool fetch_autobox_base(Compile::AliasType* atp, int& cache_offset) { -- if (atp != NULL && atp->field() != NULL) { -- ciField* field = atp->field(); -- ciSymbol* klass = field->holder()->name(); -- if (field->name() == ciSymbol::cache_field_name() && -- field->holder()->uses_default_loader() && -- klass == ciSymbol::java_lang_Integer_IntegerCache()) { -- assert(field->is_constant(), "what?"); -- ciObjArray* array = field->constant_value().as_object()->as_obj_array(); -- // Fetch the box object at the base of the array and get its value -- ciInstance* box = array->obj_at(0)->as_instance(); -- ciInstanceKlass* ik = box->klass()->as_instance_klass(); -- if (ik->nof_nonstatic_fields() == 1) { -- // This should be true nonstatic_field_at requires calling -- // nof_nonstatic_fields so check it anyway -- ciConstant c = box->field_value(ik->nonstatic_field_at(0)); -- cache_offset = c.as_int(); -- } -- return true; -- } -- } -- return false; --} -- --// Returns true if the AliasType refers to the value field of an --// autobox object. Currently only handles Integer. --static bool is_autobox_object(Compile::AliasType* atp) { -- if (atp != NULL && atp->field() != NULL) { -- ciField* field = atp->field(); -- ciSymbol* klass = field->holder()->name(); -- if (field->name() == ciSymbol::value_name() && -- field->holder()->uses_default_loader() && -- klass == ciSymbol::java_lang_Integer()) { -- return true; -- } -- } -- return false; --} -- -- --// We're loading from an object which has autobox behaviour. --// If this object is result of a valueOf call we'll have a phi --// merging a newly allocated object and a load from the cache. --// We want to replace this load with the original incoming --// argument to the valueOf call. --Node* LoadNode::eliminate_autobox(PhaseGVN* phase) { -- Node* base = in(Address)->in(AddPNode::Base); -- if (base->is_Phi() && base->req() == 3) { -- AllocateNode* allocation = NULL; -- int allocation_index = -1; -- int load_index = -1; -- for (uint i = 1; i < base->req(); i++) { -- allocation = AllocateNode::Ideal_allocation(base->in(i), phase); -- if (allocation != NULL) { -- allocation_index = i; -- load_index = 3 - allocation_index; -- break; -- } -- } -- LoadNode* load = NULL; -- if (allocation != NULL && base->in(load_index)->is_Load()) { -- load = base->in(load_index)->as_Load(); -- } -- if (load != NULL && in(Memory)->is_Phi() && in(Memory)->in(0) == base->in(0)) { -- // Push the loads from the phi that comes from valueOf up -- // through it to allow elimination of the loads and the recovery -- // of the original value. -- Node* mem_phi = in(Memory); -- Node* offset = in(Address)->in(AddPNode::Offset); -- -- Node* in1 = clone(); -- Node* in1_addr = in1->in(Address)->clone(); -- in1_addr->set_req(AddPNode::Base, base->in(allocation_index)); -- in1_addr->set_req(AddPNode::Address, base->in(allocation_index)); -- in1_addr->set_req(AddPNode::Offset, offset); -- in1->set_req(0, base->in(allocation_index)); -- in1->set_req(Address, in1_addr); -- in1->set_req(Memory, mem_phi->in(allocation_index)); -- -- Node* in2 = clone(); -- Node* in2_addr = in2->in(Address)->clone(); -- in2_addr->set_req(AddPNode::Base, base->in(load_index)); -- in2_addr->set_req(AddPNode::Address, base->in(load_index)); -- in2_addr->set_req(AddPNode::Offset, offset); -- in2->set_req(0, base->in(load_index)); -- in2->set_req(Address, in2_addr); -- in2->set_req(Memory, mem_phi->in(load_index)); -- -- in1_addr = phase->transform(in1_addr); -- in1 = phase->transform(in1); -- in2_addr = phase->transform(in2_addr); -- in2 = phase->transform(in2); -- -- PhiNode* result = PhiNode::make_blank(base->in(0), this); -- result->set_req(allocation_index, in1); -- result->set_req(load_index, in2); -- return result; -- } -- } else if (base->is_Load()) { -- // Eliminate the load of Integer.value for integers from the cache -- // array by deriving the value from the index into the array. -- // Capture the offset of the load and then reverse the computation. -- Node* load_base = base->in(Address)->in(AddPNode::Base); -- if (load_base != NULL) { -- Compile::AliasType* atp = phase->C->alias_type(load_base->adr_type()); -- intptr_t cache_offset; -- int shift = -1; -- Node* cache = NULL; -- if (is_autobox_cache(atp)) { -- shift = exact_log2(type2aelembytes[T_OBJECT]); -- cache = AddPNode::Ideal_base_and_offset(load_base->in(Address), phase, cache_offset); -- } -- if (cache != NULL && base->in(Address)->is_AddP()) { -- Node* elements[4]; -- int count = base->in(Address)->as_AddP()->unpack_offsets(elements, ARRAY_SIZE(elements)); -- int cache_low; -- if (count > 0 && fetch_autobox_base(atp, cache_low)) { -- int offset = arrayOopDesc::base_offset_in_bytes(memory_type()) - (cache_low << shift); -- // Add up all the offsets making of the address of the load -- Node* result = elements[0]; -- for (int i = 1; i < count; i++) { -- result = phase->transform(new (phase->C, 3) AddXNode(result, elements[i])); -- } -- // Remove the constant offset from the address and then -- // remove the scaling of the offset to recover the original index. -- result = phase->transform(new (phase->C, 3) AddXNode(result, phase->MakeConX(-offset))); -- if (result->Opcode() == Op_LShiftX && result->in(2) == phase->intcon(shift)) { -- // Peel the shift off directly but wrap it in a dummy node -- // since Ideal can't return existing nodes -- result = new (phase->C, 3) RShiftXNode(result->in(1), phase->intcon(0)); -- } else { -- result = new (phase->C, 3) RShiftXNode(result, phase->intcon(shift)); -- } --#ifdef _LP64 -- result = new (phase->C, 2) ConvL2INode(phase->transform(result)); --#endif -- return result; -- } -- } -- } -- } -- return NULL; --} -- -- - //------------------------------Ideal------------------------------------------ - // If the load is from Field memory and the pointer is non-null, we can - // zero out the control input. -@@ -960,17 +755,6 @@ - } - } - -- if (EliminateAutoBox && can_reshape && in(Address)->is_AddP()) { -- Node* base = in(Address)->in(AddPNode::Base); -- if (base != NULL) { -- Compile::AliasType* atp = phase->C->alias_type(adr_type()); -- if (is_autobox_object(atp)) { -- Node* result = eliminate_autobox(phase); -- if (result != NULL) return result; -- } -- } -- } -- - // Check for prior store with a different base or offset; make Load - // independent. Skip through any number of them. Bail out if the stores - // are in an endless dead cycle and report no progress. This is a key -@@ -1074,17 +858,6 @@ - // This can happen if a interface-typed array narrows to a class type. - jt = _type; - } -- -- if (EliminateAutoBox) { -- // The pointers in the autobox arrays are always non-null -- Node* base = in(Address)->in(AddPNode::Base); -- if (base != NULL) { -- Compile::AliasType* atp = phase->C->alias_type(base->adr_type()); -- if (is_autobox_cache(atp)) { -- return jt->join(TypePtr::NOTNULL)->is_ptr(); -- } -- } -- } - return jt; - } - } -@@ -1780,16 +1553,9 @@ - - //------------------------------Value----------------------------------------- - const Type *StoreCMNode::Value( PhaseTransform *phase ) const { -- // Either input is TOP ==> the result is TOP -- const Type *t = phase->type( in(MemNode::Memory) ); -- if( t == Type::TOP ) return Type::TOP; -- t = phase->type( in(MemNode::Address) ); -- if( t == Type::TOP ) return Type::TOP; -- t = phase->type( in(MemNode::ValueIn) ); -- if( t == Type::TOP ) return Type::TOP; - // If extra input is TOP ==> the result is TOP -- t = phase->type( in(MemNode::OopStore) ); -- if( t == Type::TOP ) return Type::TOP; -+ const Type *t1 = phase->type( in(MemNode::OopStore) ); -+ if( t1 == Type::TOP ) return Type::TOP; - - return StoreNode::Value( phase ); - } -diff -ruNb openjdk6/hotspot/src/share/vm/opto/memnode.hpp openjdk/hotspot/src/share/vm/opto/memnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/memnode.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/memnode.hpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)memnode.hpp 1.121 07/10/23 13:12:55 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -144,9 +141,6 @@ - // zero out the control input. - virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); - -- // Recover original value from boxed values -- Node *eliminate_autobox(PhaseGVN *phase); -- - // Compute a new Type for this node. Basically we just do the pre-check, - // then call the virtual add() to set the type. - virtual const Type *Value( PhaseTransform *phase ) const; -@@ -1066,4 +1060,3 @@ - virtual uint match_edge(uint idx) const { return idx==2; } - virtual const Type *bottom_type() const { return Type::ABIO; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/mulnode.cpp openjdk/hotspot/src/share/vm/opto/mulnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/mulnode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/mulnode.cpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)mulnode.cpp 1.134 07/07/19 19:08:26 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/mulnode.hpp openjdk/hotspot/src/share/vm/opto/mulnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/mulnode.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/mulnode.hpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)mulnode.hpp 1.53 07/05/05 17:06:18 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -248,4 +245,3 @@ - const Type *bottom_type() const { return TypeLong::LONG; } - virtual uint ideal_reg() const { return Op_RegL; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/multnode.cpp openjdk/hotspot/src/share/vm/opto/multnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/multnode.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/multnode.cpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)multnode.cpp 1.61 07/09/28 10:23:05 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -130,5 +127,3 @@ - uint ProjNode::ideal_reg() const { - return Matcher::base2reg[bottom_type()->base()]; - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/multnode.hpp openjdk/hotspot/src/share/vm/opto/multnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/multnode.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/multnode.hpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)multnode.hpp 1.47 07/09/28 10:23:05 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -82,4 +79,3 @@ - virtual void dump_spec(outputStream *st) const; - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/node.cpp openjdk/hotspot/src/share/vm/opto/node.cpp ---- openjdk6/hotspot/src/share/vm/opto/node.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/node.cpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)node.cpp 1.228 07/09/28 10:23:04 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1920,5 +1917,3 @@ - uint TypeNode::ideal_reg() const { - return Matcher::base2reg[_type->base()]; - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/node.hpp openjdk/hotspot/src/share/vm/opto/node.hpp ---- openjdk6/hotspot/src/share/vm/opto/node.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/node.hpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)node.hpp 1.224 07/09/28 10:33:17 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1493,4 +1490,3 @@ - virtual void dump_spec(outputStream *st) const; - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/opcodes.cpp openjdk/hotspot/src/share/vm/opto/opcodes.cpp ---- openjdk6/hotspot/src/share/vm/opto/opcodes.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/opcodes.cpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)opcodes.cpp 1.15 07/05/05 17:06:24 JVM" --#endif - /* - * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -43,4 +40,3 @@ - "_last_class_name", - }; - #undef macro -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/opcodes.hpp openjdk/hotspot/src/share/vm/opto/opcodes.hpp ---- openjdk6/hotspot/src/share/vm/opto/opcodes.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/opcodes.hpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)opcodes.hpp 1.31 07/05/05 17:06:24 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/optoreg.hpp openjdk/hotspot/src/share/vm/opto/optoreg.hpp ---- openjdk6/hotspot/src/share/vm/opto/optoreg.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/optoreg.hpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)optoreg.hpp 1.6 07/05/05 17:06:18 JVM" --#endif - /* - * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/output.cpp openjdk/hotspot/src/share/vm/opto/output.cpp ---- openjdk6/hotspot/src/share/vm/opto/output.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/output.cpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)output.cpp 1.290 07/09/20 11:01:49 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/output.hpp openjdk/hotspot/src/share/vm/opto/output.hpp ---- openjdk6/hotspot/src/share/vm/opto/output.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/output.hpp 2008-12-05 16:41:22.127637455 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)output.hpp 1.28 07/05/05 17:06:24 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -216,4 +213,3 @@ - #endif - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/parse.hpp openjdk/hotspot/src/share/vm/opto/parse.hpp ---- openjdk6/hotspot/src/share/vm/opto/parse.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/parse.hpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)parse.hpp 1.274 07/09/28 10:23:03 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -556,4 +553,3 @@ - void dump_bci(int bci); - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/parse1.cpp openjdk/hotspot/src/share/vm/opto/parse1.cpp ---- openjdk6/hotspot/src/share/vm/opto/parse1.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/parse1.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parse1.cpp 1.493 07/05/17 15:59:31 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/parse2.cpp openjdk/hotspot/src/share/vm/opto/parse2.cpp ---- openjdk6/hotspot/src/share/vm/opto/parse2.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/parse2.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parse2.cpp 1.364 08/07/16 09:47:25 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -868,8 +865,6 @@ - return prob < PROB_MIN; - } - --//-------------------------------repush_if_args-------------------------------- --// Push arguments of an "if" bytecode back onto the stack by adjusting _sp. - inline void Parse::repush_if_args() { - #ifndef PRODUCT - if (PrintOpto && WizardMode) { -@@ -890,9 +885,6 @@ - void Parse::do_ifnull(BoolTest::mask btest) { - int target_bci = iter().get_dest(); - -- Block* branch_block = successor_for_bci(target_bci); -- Block* next_block = successor_for_bci(iter().next_bci()); -- - float cnt; - float prob = branch_prediction(cnt, btest, target_bci); - if (prob == PROB_UNKNOWN) { -@@ -901,6 +893,7 @@ - if (PrintOpto && Verbose) - tty->print_cr("Never-taken backedge stops compilation at bci %d",bci()); - #endif -+ repush_if_args(); // to gather stats on loop - // We need to mark this branch as taken so that if we recompile we will - // see that it is possible. In the tiered system the interpreter doesn't - // do profiling and by the time we get to the lower tier from the interpreter -@@ -909,16 +902,13 @@ - uncommon_trap(Deoptimization::Reason_unreached, - Deoptimization::Action_reinterpret, - NULL, "cold"); -- if (EliminateAutoBox) { -- // Mark the successor blocks as parsed -- branch_block->next_path_num(); -- next_block->next_path_num(); -- } - return; - } - - // If this is a backwards branch in the bytecodes, add Safepoint - maybe_add_safepoint(target_bci); -+ Block* branch_block = successor_for_bci(target_bci); -+ Block* next_block = successor_for_bci(iter().next_bci()); - - explicit_null_checks_inserted++; - Node* a = null(); -@@ -945,10 +935,6 @@ - - if (stopped()) { // Path is dead? - explicit_null_checks_elided++; -- if (EliminateAutoBox) { -- // Mark the successor block as parsed -- branch_block->next_path_num(); -- } - } else { // Path is live. - // Update method data - profile_taken_branch(target_bci); -@@ -964,10 +950,6 @@ - - if (stopped()) { // Path is dead? - explicit_null_checks_elided++; -- if (EliminateAutoBox) { -- // Mark the successor block as parsed -- next_block->next_path_num(); -- } - } else { // Path is live. - // Update method data - profile_not_taken_branch(); -@@ -980,9 +962,6 @@ - void Parse::do_if(BoolTest::mask btest, Node* c) { - int target_bci = iter().get_dest(); - -- Block* branch_block = successor_for_bci(target_bci); -- Block* next_block = successor_for_bci(iter().next_bci()); -- - float cnt; - float prob = branch_prediction(cnt, btest, target_bci); - float untaken_prob = 1.0 - prob; -@@ -1001,11 +980,6 @@ - uncommon_trap(Deoptimization::Reason_unreached, - Deoptimization::Action_reinterpret, - NULL, "cold"); -- if (EliminateAutoBox) { -- // Mark the successor blocks as parsed -- branch_block->next_path_num(); -- next_block->next_path_num(); -- } - return; - } - -@@ -1044,17 +1018,15 @@ - untaken_branch = tmp; - } - -+ Block* branch_block = successor_for_bci(target_bci); -+ Block* next_block = successor_for_bci(iter().next_bci()); -+ - // Branch is taken: - { PreserveJVMState pjvms(this); - taken_branch = _gvn.transform(taken_branch); - set_control(taken_branch); - -- if (stopped()) { -- if (EliminateAutoBox) { -- // Mark the successor block as parsed -- branch_block->next_path_num(); -- } -- } else { -+ if (!stopped()) { - // Update method data - profile_taken_branch(target_bci); - adjust_map_after_if(taken_btest, c, prob, branch_block, next_block); -@@ -1067,12 +1039,7 @@ - set_control(untaken_branch); - - // Branch not taken. -- if (stopped()) { -- if (EliminateAutoBox) { -- // Mark the successor block as parsed -- next_block->next_path_num(); -- } -- } else { -+ if (!stopped()) { - // Update method data - profile_not_taken_branch(); - adjust_map_after_if(untaken_btest, c, untaken_prob, -diff -ruNb openjdk6/hotspot/src/share/vm/opto/parse3.cpp openjdk/hotspot/src/share/vm/opto/parse3.cpp ---- openjdk6/hotspot/src/share/vm/opto/parse3.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/parse3.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parse3.cpp 1.269 08/11/24 12:24:07 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/parseHelper.cpp openjdk/hotspot/src/share/vm/opto/parseHelper.cpp ---- openjdk6/hotspot/src/share/vm/opto/parseHelper.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/parseHelper.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)parseHelper.cpp 1.197 07/08/14 16:13:24 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -521,5 +518,3 @@ - increment_md_counter_at(md, data, MultiBranchData::default_count_offset()); - } - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/phase.cpp openjdk/hotspot/src/share/vm/opto/phase.cpp ---- openjdk6/hotspot/src/share/vm/opto/phase.cpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/phase.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)phase.cpp 1.59 07/05/17 16:00:26 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/phase.hpp openjdk/hotspot/src/share/vm/opto/phase.hpp ---- openjdk6/hotspot/src/share/vm/opto/phase.hpp 2008-11-25 10:12:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/phase.hpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)phase.hpp 1.53 07/05/17 16:00:29 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -114,4 +111,3 @@ - static void print_timers(); - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/phaseX.cpp openjdk/hotspot/src/share/vm/opto/phaseX.cpp ---- openjdk6/hotspot/src/share/vm/opto/phaseX.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/phaseX.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)phaseX.cpp 1.262 07/07/19 19:08:26 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/phaseX.hpp openjdk/hotspot/src/share/vm/opto/phaseX.hpp ---- openjdk6/hotspot/src/share/vm/opto/phaseX.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/phaseX.hpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)phaseX.hpp 1.119 07/05/05 17:06:26 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -517,4 +514,3 @@ - static void print_statistics(); - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/postaloc.cpp openjdk/hotspot/src/share/vm/opto/postaloc.cpp ---- openjdk6/hotspot/src/share/vm/opto/postaloc.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/postaloc.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)postaloc.cpp 1.84 08/03/26 10:13:00 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -256,8 +253,7 @@ - // nodes can represent the same constant so the type and rule of the - // MachNode must be checked to ensure equivalence. - // --bool PhaseChaitin::eliminate_copy_of_constant(Node* val, Node* n, -- Block *current_block, -+bool PhaseChaitin::eliminate_copy_of_constant(Node* val, Block *current_block, - Node_List& value, Node_List& regnd, - OptoReg::Name nreg, OptoReg::Name nreg2) { - if (value[nreg] != val && val->is_Con() && -@@ -273,12 +269,12 @@ - // Since they are equivalent the second one if redundant and can - // be removed. - // -- // n will be replaced with the old value but n might have -+ // val will be replaced with the old value but val might have - // kills projections associated with it so remove them now so that - // yank_if_dead will be able to elminate the copy once the uses - // have been transferred to the old[value]. -- for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { -- Node* use = n->fast_out(i); -+ for (DUIterator_Fast imax, i = val->fast_outs(imax); i < imax; i++) { -+ Node* use = val->fast_out(i); - if (use->is_Proj() && use->outcnt() == 0) { - // Kill projections have no users and one input - use->set_req(0, C->top()); -@@ -525,7 +521,7 @@ - // then 'n' is a useless copy. Do not update the register->node - // mapping so 'n' will go dead. - if( value[nreg] != val ) { -- if (eliminate_copy_of_constant(val, n, b, value, regnd, nreg, OptoReg::Bad)) { -+ if (eliminate_copy_of_constant(val, b, value, regnd, nreg, OptoReg::Bad)) { - n->replace_by(regnd[nreg]); - j -= yank_if_dead(n,b,&value,®nd); - } else { -@@ -553,7 +549,7 @@ - nreg_lo = tmp.find_first_elem(); - } - if( value[nreg] != val || value[nreg_lo] != val ) { -- if (eliminate_copy_of_constant(val, n, b, value, regnd, nreg, nreg_lo)) { -+ if (eliminate_copy_of_constant(n, b, value, regnd, nreg, nreg_lo)) { - n->replace_by(regnd[nreg]); - j -= yank_if_dead(n,b,&value,®nd); - } else { -@@ -586,5 +582,3 @@ - - } // End for all blocks - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/reg_split.cpp openjdk/hotspot/src/share/vm/opto/reg_split.cpp ---- openjdk6/hotspot/src/share/vm/opto/reg_split.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/reg_split.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)reg_split.cpp 1.81 07/05/05 17:06:27 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -287,7 +284,7 @@ - // Check for single-def (LRG cannot redefined) - uint lidx = n2lidx(in); - if( lidx >= _maxlrg ) continue; // Value is a recent spill-copy -- if (lrgs(lidx).is_singledef()) continue; -+ if( lrgs(lidx)._def != NodeSentinel ) continue; - - Block *b_def = _cfg._bbs[def->_idx]; - int idx_def = b_def->find_node(def); -@@ -314,20 +311,12 @@ - uint lidx = Find_id(in); - - // Walk backwards thru spill copy node intermediates -- if (walkThru) { -+ if( walkThru ) - while ( in->is_SpillCopy() && lidx >= _maxlrg ) { - in = in->in(1); - lidx = Find_id(in); - } - -- if (lidx < _maxlrg && lrgs(lidx).is_multidef()) { -- // walkThru found a multidef LRG, which is unsafe to use, so -- // just keep the original def used in the clone. -- in = spill->in(i); -- lidx = Find_id(in); -- } -- } -- - if( lidx < _maxlrg && lrgs(lidx).reg() >= LRG::SPILL_REG ) { - Node *rdef = Reachblock[lrg2reach[lidx]]; - if( rdef ) spill->set_req(i,rdef); -@@ -516,7 +505,7 @@ - // Do not bother splitting or putting in Phis for single-def - // rematerialized live ranges. This happens alot to constants - // with long live ranges. -- if( lrgs(lidx).is_singledef() && -+ if( lrgs(lidx)._def != NodeSentinel && - lrgs(lidx)._def->rematerialize() ) { - // reset the Reaches & UP entries - Reachblock[slidx] = lrgs(lidx)._def; -diff -ruNb openjdk6/hotspot/src/share/vm/opto/regalloc.cpp openjdk/hotspot/src/share/vm/opto/regalloc.cpp ---- openjdk6/hotspot/src/share/vm/opto/regalloc.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/regalloc.cpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)regalloc.cpp 1.28 07/05/05 17:06:27 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -128,4 +125,3 @@ - } - } - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/regalloc.hpp openjdk/hotspot/src/share/vm/opto/regalloc.hpp ---- openjdk6/hotspot/src/share/vm/opto/regalloc.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/regalloc.hpp 2008-12-05 16:41:22.137637606 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)regalloc.hpp 1.23 07/05/05 17:06:28 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/regmask.cpp openjdk/hotspot/src/share/vm/opto/regmask.cpp ---- openjdk6/hotspot/src/share/vm/opto/regmask.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/regmask.cpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)regmask.cpp 1.62 07/05/05 17:06:25 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -289,5 +286,3 @@ - tty->print("]"); - } - #endif -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/regmask.hpp openjdk/hotspot/src/share/vm/opto/regmask.hpp ---- openjdk6/hotspot/src/share/vm/opto/regmask.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/regmask.hpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)regmask.hpp 1.65 07/05/05 17:06:26 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/rootnode.cpp openjdk/hotspot/src/share/vm/opto/rootnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/rootnode.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/rootnode.cpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)rootnode.cpp 1.77 07/05/05 17:06:28 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -82,5 +79,3 @@ - const RegMask &HaltNode::out_RegMask() const { - return RegMask::Empty; - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/rootnode.hpp openjdk/hotspot/src/share/vm/opto/rootnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/rootnode.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/rootnode.hpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)rootnode.hpp 1.48 07/05/05 17:06:28 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -63,4 +60,3 @@ - virtual uint ideal_reg() const { return NotAMachineReg; } - virtual uint match_edge(uint idx) const { return 0; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/runtime.cpp openjdk/hotspot/src/share/vm/opto/runtime.cpp ---- openjdk6/hotspot/src/share/vm/opto/runtime.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/runtime.cpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)runtime.cpp 1.460 07/09/20 10:43:58 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/runtime.hpp openjdk/hotspot/src/share/vm/opto/runtime.hpp ---- openjdk6/hotspot/src/share/vm/opto/runtime.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/runtime.hpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)runtime.hpp 1.201 07/09/20 10:43:58 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/split_if.cpp openjdk/hotspot/src/share/vm/opto/split_if.cpp ---- openjdk6/hotspot/src/share/vm/opto/split_if.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/split_if.cpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)split_if.cpp 1.68 07/05/05 17:06:29 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -537,4 +534,3 @@ - if( VerifyLoopOptimizations ) verify(); - #endif - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/subnode.cpp openjdk/hotspot/src/share/vm/opto/subnode.cpp ---- openjdk6/hotspot/src/share/vm/opto/subnode.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/subnode.cpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)subnode.cpp 1.162 07/09/28 10:33:21 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1207,4 +1204,3 @@ - if( d2 < 0.0 ) return Type::DOUBLE; - return TypeD::make( SharedRuntime::dpow( d1, d2 ) ); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/subnode.hpp openjdk/hotspot/src/share/vm/opto/subnode.hpp ---- openjdk6/hotspot/src/share/vm/opto/subnode.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/subnode.hpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)subnode.hpp 1.86 07/09/28 10:23:02 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/superword.cpp openjdk/hotspot/src/share/vm/opto/superword.cpp ---- openjdk6/hotspot/src/share/vm/opto/superword.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/superword.cpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)superword.cpp 1.8 08/03/26 10:13:00 JVM" --#endif - /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -185,8 +182,8 @@ - - #ifndef PRODUCT - if (TraceSuperWord) -- tty->print_cr("\noffset = %d iv_adjustment = %d elt_align = %d scale = %d iv_stride = %d", -- offset, iv_adjustment, align_to_ref_p.memory_size(), align_to_ref_p.scale_in_bytes(), iv_stride()); -+ tty->print_cr("\noffset = %d iv_adjustment = %d elt_align = %d", -+ offset, iv_adjustment, align_to_ref_p.memory_size()); - #endif - - // Set alignment relative to "align_to_ref" -@@ -1545,7 +1542,7 @@ - Node *pre_opaq1 = pre_end->limit(); - assert(pre_opaq1->Opcode() == Op_Opaque1, ""); - Opaque1Node *pre_opaq = (Opaque1Node*)pre_opaq1; -- Node *lim0 = pre_opaq->in(1); -+ Node *pre_limit = pre_opaq->in(1); - - // Where we put new limit calculations - Node *pre_ctrl = pre_end->loopnode()->in(LoopNode::EntryControl); -@@ -1557,116 +1554,64 @@ - - SWPointer align_to_ref_p(align_to_ref, this); - -- // Given: -- // lim0 == original pre loop limit -- // V == v_align (power of 2) -- // invar == extra invariant piece of the address expression -- // e == k [ +/- invar ] -- // -- // When reassociating expressions involving '%' the basic rules are: -- // (a - b) % k == 0 => a % k == b % k -- // and: -- // (a + b) % k == 0 => a % k == (k - b) % k -- // -- // For stride > 0 && scale > 0, -- // Derive the new pre-loop limit "lim" such that the two constraints: -- // (1) lim = lim0 + N (where N is some positive integer < V) -- // (2) (e + lim) % V == 0 -- // are true. -- // -- // Substituting (1) into (2), -- // (e + lim0 + N) % V == 0 -- // solve for N: -- // N = (V - (e + lim0)) % V -- // substitute back into (1), so that new limit -- // lim = lim0 + (V - (e + lim0)) % V -+ // Let l0 == original pre_limit, l == new pre_limit, V == v_align - // -- // For stride > 0 && scale < 0 -- // Constraints: -- // lim = lim0 + N -- // (e - lim) % V == 0 -- // Solving for lim: -- // (e - lim0 - N) % V == 0 -- // N = (e - lim0) % V -- // lim = lim0 + (e - lim0) % V -- // -- // For stride < 0 && scale > 0 -- // Constraints: -- // lim = lim0 - N -- // (e + lim) % V == 0 -- // Solving for lim: -- // (e + lim0 - N) % V == 0 -- // N = (e + lim0) % V -- // lim = lim0 - (e + lim0) % V -- // -- // For stride < 0 && scale < 0 -- // Constraints: -- // lim = lim0 - N -- // (e - lim) % V == 0 -- // Solving for lim: -- // (e - lim0 + N) % V == 0 -- // N = [V - (e - lim0) % V] % V -- // lim = lim0 - (V - (e - lim0)) % V -+ // For stride > 0 -+ // Need l such that l > l0 && (l+k)%V == 0 -+ // Find n such that l = (l0 + n) -+ // (l0 + n + k) % V == 0 -+ // n = [V - (l0 + k)%V]%V -+ // new limit = l0 + [V - (l0 + k)%V]%V -+ // For stride < 0 -+ // Need l such that l < l0 && (l+k)%V == 0 -+ // Find n such that l = (l0 - n) -+ // (l0 - n + k) % V == 0 -+ // n = (l0 + k)%V -+ // new limit = l0 - (l0 + k)%V - -- int stride = iv_stride(); -- int scale = align_to_ref_p.scale_in_bytes(); - int elt_size = align_to_ref_p.memory_size(); - int v_align = vector_width_in_bytes() / elt_size; - int k = align_to_ref_p.offset_in_bytes() / elt_size; - - Node *kn = _igvn.intcon(k); -- -- Node *e = kn; -+ Node *limk = new (_phase->C, 3) AddINode(pre_limit, kn); -+ _phase->_igvn.register_new_node_with_optimizer(limk); -+ _phase->set_ctrl(limk, pre_ctrl); - if (align_to_ref_p.invar() != NULL) { -- // incorporate any extra invariant piece producing k +/- invar >>> log2(elt) - Node* log2_elt = _igvn.intcon(exact_log2(elt_size)); - Node* aref = new (_phase->C, 3) URShiftINode(align_to_ref_p.invar(), log2_elt); - _phase->_igvn.register_new_node_with_optimizer(aref); - _phase->set_ctrl(aref, pre_ctrl); -- if (align_to_ref_p.negate_invar()) { -- e = new (_phase->C, 3) SubINode(e, aref); -+ if (!align_to_ref_p.negate_invar()) { -+ limk = new (_phase->C, 3) AddINode(limk, aref); - } else { -- e = new (_phase->C, 3) AddINode(e, aref); -+ limk = new (_phase->C, 3) SubINode(limk, aref); - } -- _phase->_igvn.register_new_node_with_optimizer(e); -- _phase->set_ctrl(e, pre_ctrl); -+ _phase->_igvn.register_new_node_with_optimizer(limk); -+ _phase->set_ctrl(limk, pre_ctrl); - } -- -- // compute e +/- lim0 -- if (scale < 0) { -- e = new (_phase->C, 3) SubINode(e, lim0); -- } else { -- e = new (_phase->C, 3) AddINode(e, lim0); -- } -- _phase->_igvn.register_new_node_with_optimizer(e); -- _phase->set_ctrl(e, pre_ctrl); -- -- if (stride * scale > 0) { -- // compute V - (e +/- lim0) -- Node* va = _igvn.intcon(v_align); -- e = new (_phase->C, 3) SubINode(va, e); -- _phase->_igvn.register_new_node_with_optimizer(e); -- _phase->set_ctrl(e, pre_ctrl); -- } -- // compute N = (exp) % V - Node* va_msk = _igvn.intcon(v_align - 1); -- Node* N = new (_phase->C, 3) AndINode(e, va_msk); -- _phase->_igvn.register_new_node_with_optimizer(N); -- _phase->set_ctrl(N, pre_ctrl); -- -- // substitute back into (1), so that new limit -- // lim = lim0 + N -- Node* lim; -- if (stride < 0) { -- lim = new (_phase->C, 3) SubINode(lim0, N); -+ Node* n = new (_phase->C, 3) AndINode(limk, va_msk); -+ _phase->_igvn.register_new_node_with_optimizer(n); -+ _phase->set_ctrl(n, pre_ctrl); -+ Node* newlim; -+ if (iv_stride() > 0) { -+ Node* va = _igvn.intcon(v_align); -+ Node* adj = new (_phase->C, 3) SubINode(va, n); -+ _phase->_igvn.register_new_node_with_optimizer(adj); -+ _phase->set_ctrl(adj, pre_ctrl); -+ Node* adj2 = new (_phase->C, 3) AndINode(adj, va_msk); -+ _phase->_igvn.register_new_node_with_optimizer(adj2); -+ _phase->set_ctrl(adj2, pre_ctrl); -+ newlim = new (_phase->C, 3) AddINode(pre_limit, adj2); - } else { -- lim = new (_phase->C, 3) AddINode(lim0, N); -+ newlim = new (_phase->C, 3) SubINode(pre_limit, n); - } -- _phase->_igvn.register_new_node_with_optimizer(lim); -- _phase->set_ctrl(lim, pre_ctrl); -+ _phase->_igvn.register_new_node_with_optimizer(newlim); -+ _phase->set_ctrl(newlim, pre_ctrl); - Node* constrained = -- (stride > 0) ? (Node*) new (_phase->C,3) MinINode(lim, orig_limit) -- : (Node*) new (_phase->C,3) MaxINode(lim, orig_limit); -+ (iv_stride() > 0) ? (Node*) new (_phase->C,3) MinINode(newlim, orig_limit) -+ : (Node*) new (_phase->C,3) MaxINode(newlim, orig_limit); - _phase->_igvn.register_new_node_with_optimizer(constrained); - _phase->set_ctrl(constrained, pre_ctrl); - _igvn.hash_delete(pre_opaq); -diff -ruNb openjdk6/hotspot/src/share/vm/opto/superword.hpp openjdk/hotspot/src/share/vm/opto/superword.hpp ---- openjdk6/hotspot/src/share/vm/opto/superword.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/superword.hpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)superword.hpp 1.7 07/08/03 14:17:20 JVM" --#endif - /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/type.cpp openjdk/hotspot/src/share/vm/opto/type.cpp ---- openjdk6/hotspot/src/share/vm/opto/type.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/type.cpp 2008-12-05 16:41:22.147637756 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)type.cpp 1.257 07/10/04 14:36:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -3752,4 +3749,3 @@ - } - return range()->field_at(TypeFunc::Parms)->basic_type(); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/type.hpp openjdk/hotspot/src/share/vm/opto/type.hpp ---- openjdk6/hotspot/src/share/vm/opto/type.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/type.hpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)type.hpp 1.159 07/10/23 13:12:48 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1073,7 +1070,6 @@ - #define LShiftXNode LShiftLNode - // For object size computation: - #define AddXNode AddLNode --#define RShiftXNode RShiftLNode - // For card marks and hashcodes - #define URShiftXNode URShiftLNode - // Opcodes -@@ -1112,7 +1108,6 @@ - #define LShiftXNode LShiftINode - // For object size computation: - #define AddXNode AddINode --#define RShiftXNode RShiftINode - // For card marks and hashcodes - #define URShiftXNode URShiftINode - // Opcodes -@@ -1127,4 +1122,3 @@ - #define ConvX2L(x) ConvI2L(x) - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/opto/vectornode.cpp openjdk/hotspot/src/share/vm/opto/vectornode.cpp ---- openjdk6/hotspot/src/share/vm/opto/vectornode.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/vectornode.cpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vectornode.cpp 1.5 07/05/17 16:02:33 JVM" --#endif - /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/opto/vectornode.hpp openjdk/hotspot/src/share/vm/opto/vectornode.hpp ---- openjdk6/hotspot/src/share/vm/opto/vectornode.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/opto/vectornode.hpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vectornode.hpp 1.6 07/05/17 16:02:36 JVM" --#endif - /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/evmCompat.cpp openjdk/hotspot/src/share/vm/prims/evmCompat.cpp ---- openjdk6/hotspot/src/share/vm/prims/evmCompat.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/evmCompat.cpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)evmCompat.cpp 1.12 07/05/05 17:06:31 JVM" --#endif - /* - * Copyright 1999-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/forte.cpp openjdk/hotspot/src/share/vm/prims/forte.cpp ---- openjdk6/hotspot/src/share/vm/prims/forte.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/forte.cpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)forte.cpp 1.70 07/08/31 18:43:32 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/forte.hpp openjdk/hotspot/src/share/vm/prims/forte.hpp ---- openjdk6/hotspot/src/share/vm/prims/forte.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/forte.hpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)forte.hpp 1.8 07/06/26 10:28:19 JVM" --#endif - /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/hpi_imported.h openjdk/hotspot/src/share/vm/prims/hpi_imported.h ---- openjdk6/hotspot/src/share/vm/prims/hpi_imported.h 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/hpi_imported.h 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)hpi_imported.h 1.17 07/05/05 17:06:31 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -318,4 +315,3 @@ - #endif - - #endif /* !_JAVASOFT_HPI_H_ */ -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp ---- openjdk6/hotspot/src/share/vm/prims/jni.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jni.cpp 1.436 07/07/11 09:47:42 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -3583,4 +3580,3 @@ - jni_GetEnv, - jni_AttachCurrentThreadAsDaemon - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jni.h openjdk/hotspot/src/share/vm/prims/jni.h ---- openjdk6/hotspot/src/share/vm/prims/jni.h 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jni.h 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jni.h 1.45 07/05/05 17:06:31 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1960,6 +1957,3 @@ - #endif /* __cplusplus */ - - #endif /* !_JAVASOFT_JNI_H_ */ -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jniCheck.cpp openjdk/hotspot/src/share/vm/prims/jniCheck.cpp ---- openjdk6/hotspot/src/share/vm/prims/jniCheck.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jniCheck.cpp 1.50 07/08/31 11:20:56 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -2050,5 +2047,3 @@ - - return &checked_jni_NativeInterface; - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jniCheck.hpp openjdk/hotspot/src/share/vm/prims/jniCheck.hpp ---- openjdk6/hotspot/src/share/vm/prims/jniCheck.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jniCheck.hpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jniCheck.hpp 1.11 07/05/05 17:06:32 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jniFastGetField.cpp openjdk/hotspot/src/share/vm/prims/jniFastGetField.cpp ---- openjdk6/hotspot/src/share/vm/prims/jniFastGetField.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jniFastGetField.cpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jniFastGetField.cpp 1.8 07/05/05 17:06:32 JVM" --#endif - /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -40,4 +37,3 @@ - } - return (address)-1; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jniFastGetField.hpp openjdk/hotspot/src/share/vm/prims/jniFastGetField.hpp ---- openjdk6/hotspot/src/share/vm/prims/jniFastGetField.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jniFastGetField.hpp 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jniFastGetField.hpp 1.8 07/05/05 17:06:32 JVM" --#endif - /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jni_md.h openjdk/hotspot/src/share/vm/prims/jni_md.h ---- openjdk6/hotspot/src/share/vm/prims/jni_md.h 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jni_md.h 2008-12-05 16:41:22.157637907 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jni_md.h 1.25 07/05/05 17:06:34 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvm.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp 2008-12-05 16:41:22.167638058 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvm.cpp 1.570 07/08/17 11:48:55 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -4499,4 +4496,3 @@ - #endif // KERNEL - } - JVM_END -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvm.h openjdk/hotspot/src/share/vm/prims/jvm.h ---- openjdk6/hotspot/src/share/vm/prims/jvm.h 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvm.h 2008-12-05 16:41:22.167638058 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvm.h 1.88 07/08/15 20:22:47 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvm_misc.hpp openjdk/hotspot/src/share/vm/prims/jvm_misc.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvm_misc.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvm_misc.hpp 2008-12-05 16:41:22.167638058 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvm_misc.hpp 1.24 07/05/05 17:06:34 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiAgentThread.hpp openjdk/hotspot/src/share/vm/prims/jvmtiAgentThread.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiAgentThread.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiAgentThread.hpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiAgentThread.hpp 1.13 07/05/05 17:06:36 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiClassFileReconstituter.cpp 1.21 07/05/05 17:06:36 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiClassFileReconstituter.hpp 1.15 07/05/05 17:06:36 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp openjdk/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiCodeBlobEvents.cpp 1.20 07/05/05 17:06:36 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.hpp openjdk/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.hpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiCodeBlobEvents.hpp 1.11 07/05/05 17:06:35 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEnter.hpp openjdk/hotspot/src/share/vm/prims/jvmtiEnter.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEnter.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.hpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiEnter.hpp 1.8 07/05/05 17:06:35 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEnv.cpp openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiEnv.cpp 1.166 07/08/15 15:11:03 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiEnvBase.cpp 1.90 07/07/16 14:37:39 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiEnvBase.hpp 1.69 07/08/11 03:57:00 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp openjdk/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiEnvThreadState.cpp 1.23 07/05/23 10:53:46 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -314,4 +311,3 @@ - clear_current_location(); - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEnvThreadState.hpp openjdk/hotspot/src/share/vm/prims/jvmtiEnvThreadState.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEnvThreadState.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnvThreadState.hpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiEnvThreadState.hpp 1.17 07/05/05 17:06:37 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -176,4 +173,3 @@ - }; - - #endif /* _JAVA_JVMTIENVTHREADSTATE_H_ */ -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEventController.cpp openjdk/hotspot/src/share/vm/prims/jvmtiEventController.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEventController.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEventController.cpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiEventController.cpp 1.57 07/08/29 13:42:27 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEventController.hpp openjdk/hotspot/src/share/vm/prims/jvmtiEventController.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEventController.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEventController.hpp 2008-12-05 16:41:22.177638209 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiEventController.hpp 1.22 07/05/05 17:06:37 JVM" --#endif - /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiEventController.inline.hpp openjdk/hotspot/src/share/vm/prims/jvmtiEventController.inline.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiEventController.inline.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEventController.inline.hpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiEventController.inline.hpp 1.14 07/05/05 17:06:37 JVM" --#endif - /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -102,4 +99,3 @@ - inline bool JvmtiEventController::is_enabled(jvmtiEvent event_type) { - return _universal_global_event_enabled.is_enabled(event_type); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiExport.cpp openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiExport.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiExport.cpp 1.127 07/07/18 17:27:01 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -2495,4 +2492,3 @@ - JvmtiTagMap::gc_epilogue(_full); - } - #endif // JVMTI_KERNEL -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiExport.hpp openjdk/hotspot/src/share/vm/prims/jvmtiExport.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiExport.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.hpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiExport.hpp 1.96 07/06/26 10:28:18 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiExtensions.cpp openjdk/hotspot/src/share/vm/prims/jvmtiExtensions.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiExtensions.cpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExtensions.cpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiExtensions.cpp 1.11 07/05/05 17:06:38 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiExtensions.hpp openjdk/hotspot/src/share/vm/prims/jvmtiExtensions.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiExtensions.hpp 2008-11-25 10:12:11.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExtensions.hpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiExtensions.hpp 1.8 07/05/05 17:06:38 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp openjdk/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiGetLoadedClasses.cpp 1.13 07/05/05 17:06:38 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.hpp openjdk/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.hpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiGetLoadedClasses.hpp 1.8 07/05/05 17:06:38 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiImpl.cpp openjdk/hotspot/src/share/vm/prims/jvmtiImpl.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiImpl.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiImpl.cpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiImpl.cpp 1.64 07/07/16 14:37:37 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiImpl.hpp openjdk/hotspot/src/share/vm/prims/jvmtiImpl.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiImpl.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiImpl.hpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiImpl.hpp 1.103 07/07/16 14:37:36 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -478,4 +475,3 @@ - - // Utility macro that checks for NULL pointers: - #define NULL_CHECK(X, Y) if ((X) == NULL) { return (Y); } -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiManageCapabilities.cpp 1.44 07/05/05 17:06:40 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -458,5 +455,3 @@ - } - - #endif -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiManageCapabilities.hpp openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiManageCapabilities.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.hpp 2008-12-05 16:41:22.187638360 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiManageCapabilities.hpp 1.11 07/05/05 17:06:39 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiRedefineClasses.cpp 1.79 07/07/16 14:37:37 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiRedefineClasses.hpp 1.42 08/11/24 12:24:40 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiRedefineClassesTrace.hpp openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClassesTrace.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiRedefineClassesTrace.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiRedefineClassesTrace.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiRedefineClassesTrace.hpp 1.2 07/12/20 10:58:59 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -67,7 +64,7 @@ - // 0x01000000 | 16777216 - impl details: nmethod evolution info - // 0x02000000 | 33554432 - impl details: annotation updates - // 0x04000000 | 67108864 - impl details: StackMapTable updates --// 0x08000000 | 134217728 - impl details: OopMapCache updates -+// 0x08000000 | 134217728 - unused - // 0x10000000 | 268435456 - unused - // 0x20000000 | 536870912 - unused - // 0x40000000 | 1073741824 - unused -@@ -124,5 +121,3 @@ - if (RC_TRACE_ENABLED(0x00000004)) { \ - t.stop(); \ - } while (0) -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiTagMap.cpp openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiTagMap.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.cpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiTagMap.cpp 1.85 07/06/27 00:30:05 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiTagMap.hpp openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiTagMap.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiTagMap.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiTagMap.hpp 1.25 07/05/05 17:06:40 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -136,4 +133,3 @@ - }; - - #endif /* _JAVA_JVMTI_TAG_MAP_H_ */ -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiThreadState.cpp openjdk/hotspot/src/share/vm/prims/jvmtiThreadState.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiThreadState.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiThreadState.cpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiThreadState.cpp 1.44 07/05/05 17:06:36 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiThreadState.hpp openjdk/hotspot/src/share/vm/prims/jvmtiThreadState.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiThreadState.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiThreadState.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiThreadState.hpp 1.35 07/05/05 17:06:40 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiThreadState.inline.hpp openjdk/hotspot/src/share/vm/prims/jvmtiThreadState.inline.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiThreadState.inline.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiThreadState.inline.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiThreadState.inline.hpp 1.7 07/05/05 17:06:40 JVM" --#endif - /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -63,4 +60,3 @@ - void JvmtiThreadState::set_head_env_thread_state(JvmtiEnvThreadState* ets) { - _head_env_thread_state = ets; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiTrace.cpp openjdk/hotspot/src/share/vm/prims/jvmtiTrace.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiTrace.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiTrace.cpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiTrace.cpp 1.1 07/07/16 15:03:49 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiTrace.hpp openjdk/hotspot/src/share/vm/prims/jvmtiTrace.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiTrace.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiTrace.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiTrace.hpp 1.1 07/07/16 15:03:49 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiUtil.cpp openjdk/hotspot/src/share/vm/prims/jvmtiUtil.cpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiUtil.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiUtil.cpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvmtiUtil.cpp 1.1 07/07/16 15:03:50 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -41,4 +38,3 @@ - } - return _single_threaded_resource_area; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/jvmtiUtil.hpp openjdk/hotspot/src/share/vm/prims/jvmtiUtil.hpp ---- openjdk6/hotspot/src/share/vm/prims/jvmtiUtil.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiUtil.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvmtiUtil.hpp 1.1 07/07/16 15:03:50 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -87,4 +84,3 @@ - SafeResourceMark() : ResourceMark(safe_resource_area()) {} - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/methodComparator.cpp openjdk/hotspot/src/share/vm/prims/methodComparator.cpp ---- openjdk6/hotspot/src/share/vm/prims/methodComparator.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/methodComparator.cpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)methodComparator.cpp 1.15 07/05/05 17:06:41 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/methodComparator.hpp openjdk/hotspot/src/share/vm/prims/methodComparator.hpp ---- openjdk6/hotspot/src/share/vm/prims/methodComparator.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/methodComparator.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)methodComparator.hpp 1.12 07/05/05 17:06:40 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/nativeLookup.cpp openjdk/hotspot/src/share/vm/prims/nativeLookup.cpp ---- openjdk6/hotspot/src/share/vm/prims/nativeLookup.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/nativeLookup.cpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)nativeLookup.cpp 1.82 07/05/05 17:06:42 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/nativeLookup.hpp openjdk/hotspot/src/share/vm/prims/nativeLookup.hpp ---- openjdk6/hotspot/src/share/vm/prims/nativeLookup.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/nativeLookup.hpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)nativeLookup.hpp 1.27 07/05/05 17:06:41 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/prims/perf.cpp openjdk/hotspot/src/share/vm/prims/perf.cpp ---- openjdk6/hotspot/src/share/vm/prims/perf.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/perf.cpp 2008-12-05 16:41:22.197638511 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)perf.cpp 1.15 07/05/05 17:06:34 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -314,4 +311,3 @@ - guarantee(ok == 0, "register perf natives"); - } - JVM_END -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/privilegedStack.cpp openjdk/hotspot/src/share/vm/prims/privilegedStack.cpp ---- openjdk6/hotspot/src/share/vm/prims/privilegedStack.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/privilegedStack.cpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)privilegedStack.cpp 1.31 07/05/05 17:06:42 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -77,4 +74,3 @@ - } - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/privilegedStack.hpp openjdk/hotspot/src/share/vm/prims/privilegedStack.hpp ---- openjdk6/hotspot/src/share/vm/prims/privilegedStack.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/privilegedStack.hpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)privilegedStack.hpp 1.25 07/05/05 17:06:41 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -44,4 +41,3 @@ - void print_on(outputStream* st) const PRODUCT_RETURN; - bool contains(address addr) PRODUCT_RETURN0; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/prims/unsafe.cpp openjdk/hotspot/src/share/vm/prims/unsafe.cpp ---- openjdk6/hotspot/src/share/vm/prims/unsafe.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)unsafe.cpp 1.64 07/05/17 16:05:09 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/aprofiler.cpp openjdk/hotspot/src/share/vm/runtime/aprofiler.cpp ---- openjdk6/hotspot/src/share/vm/runtime/aprofiler.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/aprofiler.cpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)aprofiler.cpp 1.33 07/05/05 17:06:43 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/aprofiler.hpp openjdk/hotspot/src/share/vm/runtime/aprofiler.hpp ---- openjdk6/hotspot/src/share/vm/runtime/aprofiler.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/aprofiler.hpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)aprofiler.hpp 1.32 07/05/05 17:06:42 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp ---- openjdk6/hotspot/src/share/vm/runtime/arguments.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)arguments.cpp 1.337 07/10/23 13:12:47 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1257,22 +1254,6 @@ - - // Aggressive optimization flags -XX:+AggressiveOpts - void Arguments::set_aggressive_opts_flags() { --#ifdef COMPILER2 -- if (AggressiveOpts || !FLAG_IS_DEFAULT(AutoBoxCacheMax)) { -- if (FLAG_IS_DEFAULT(EliminateAutoBox)) { -- FLAG_SET_DEFAULT(EliminateAutoBox, true); -- } -- if (FLAG_IS_DEFAULT(AutoBoxCacheMax)) { -- FLAG_SET_DEFAULT(AutoBoxCacheMax, 20000); -- } -- -- // Feed the cache size setting into the JDK -- char buffer[1024]; -- sprintf(buffer, "java.lang.Integer.IntegerCache.high=%d", AutoBoxCacheMax); -- add_property(buffer); -- } --#endif -- - if (AggressiveOpts) { - NOT_WINDOWS( - // No measured benefit on Windows -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/arguments.hpp openjdk/hotspot/src/share/vm/runtime/arguments.hpp ---- openjdk6/hotspot/src/share/vm/runtime/arguments.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/arguments.hpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)arguments.hpp 1.104 07/09/04 17:30:49 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/atomic.cpp openjdk/hotspot/src/share/vm/runtime/atomic.cpp ---- openjdk6/hotspot/src/share/vm/runtime/atomic.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/atomic.cpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)atomic.cpp 1.14 07/05/05 17:06:42 JVM" --#endif - /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/atomic.hpp openjdk/hotspot/src/share/vm/runtime/atomic.hpp ---- openjdk6/hotspot/src/share/vm/runtime/atomic.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/atomic.hpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)atomic.hpp 1.22 07/05/05 17:06:42 JVM" --#endif - /* - * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/biasedLocking.cpp openjdk/hotspot/src/share/vm/runtime/biasedLocking.cpp ---- openjdk6/hotspot/src/share/vm/runtime/biasedLocking.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/biasedLocking.cpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)biasedLocking.cpp 1.15 07/05/23 10:53:58 JVM" --#endif - - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/biasedLocking.hpp openjdk/hotspot/src/share/vm/runtime/biasedLocking.hpp ---- openjdk6/hotspot/src/share/vm/runtime/biasedLocking.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/biasedLocking.hpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)biasedLocking.hpp 1.11 07/05/17 16:05:21 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/compilationPolicy.cpp openjdk/hotspot/src/share/vm/runtime/compilationPolicy.cpp ---- openjdk6/hotspot/src/share/vm/runtime/compilationPolicy.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/compilationPolicy.cpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)compilationPolicy.cpp 1.45 07/05/05 17:06:45 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -449,4 +446,3 @@ - - - #endif // COMPILER2 -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/compilationPolicy.hpp openjdk/hotspot/src/share/vm/runtime/compilationPolicy.hpp ---- openjdk6/hotspot/src/share/vm/runtime/compilationPolicy.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/compilationPolicy.hpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)compilationPolicy.hpp 1.15 07/05/05 17:06:44 JVM" --#endif - /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/deoptimization.cpp openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp ---- openjdk6/hotspot/src/share/vm/runtime/deoptimization.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)deoptimization.cpp 1.284 07/08/29 13:42:28 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/deoptimization.hpp openjdk/hotspot/src/share/vm/runtime/deoptimization.hpp ---- openjdk6/hotspot/src/share/vm/runtime/deoptimization.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/deoptimization.hpp 2008-12-05 16:41:22.207638662 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)deoptimization.hpp 1.92 07/07/27 16:21:04 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/extendedPC.hpp openjdk/hotspot/src/share/vm/runtime/extendedPC.hpp ---- openjdk6/hotspot/src/share/vm/runtime/extendedPC.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/extendedPC.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)extendedPC.hpp 1.17 07/05/05 17:06:46 JVM" --#endif - /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/fieldDescriptor.cpp openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.cpp ---- openjdk6/hotspot/src/share/vm/runtime/fieldDescriptor.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.cpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)fieldDescriptor.cpp 1.56 07/05/05 17:06:46 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/fieldDescriptor.hpp openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.hpp ---- openjdk6/hotspot/src/share/vm/runtime/fieldDescriptor.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/fieldDescriptor.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)fieldDescriptor.hpp 1.46 07/05/05 17:06:47 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/fieldType.cpp openjdk/hotspot/src/share/vm/runtime/fieldType.cpp ---- openjdk6/hotspot/src/share/vm/runtime/fieldType.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/fieldType.cpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)fieldType.cpp 1.27 07/05/05 17:06:47 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -93,4 +90,3 @@ - *dimension = dim; - return element_type; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/fieldType.hpp openjdk/hotspot/src/share/vm/runtime/fieldType.hpp ---- openjdk6/hotspot/src/share/vm/runtime/fieldType.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/fieldType.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)fieldType.hpp 1.28 07/05/05 17:06:47 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -53,4 +50,3 @@ - // Parse field and extract array information. Works for T_ARRAY only. - static BasicType get_array_info(symbolOop signature, jint* dimension, symbolOop *object_key, TRAPS); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/fprofiler.cpp openjdk/hotspot/src/share/vm/runtime/fprofiler.cpp ---- openjdk6/hotspot/src/share/vm/runtime/fprofiler.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/fprofiler.cpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)fprofiler.cpp 1.137 07/08/31 18:44:03 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/fprofiler.hpp openjdk/hotspot/src/share/vm/runtime/fprofiler.hpp ---- openjdk6/hotspot/src/share/vm/runtime/fprofiler.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/fprofiler.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)fprofiler.hpp 1.55 07/06/17 14:09:46 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -312,4 +309,3 @@ - static IntervalData* interval_data; - #endif // FPROF_KERNEL - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/frame.cpp openjdk/hotspot/src/share/vm/runtime/frame.cpp ---- openjdk6/hotspot/src/share/vm/runtime/frame.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)frame.cpp 1.235 07/09/25 17:07:43 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1409,4 +1406,3 @@ - _fr = thread->last_frame(); - _is_done = false; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/frame.hpp openjdk/hotspot/src/share/vm/runtime/frame.hpp ---- openjdk6/hotspot/src/share/vm/runtime/frame.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/frame.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)frame.hpp 1.164 07/08/29 13:42:28 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -470,4 +467,3 @@ - frame *current() { return &_fr; } - RegisterMap* register_map() { return &_reg_map; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/frame.inline.hpp openjdk/hotspot/src/share/vm/runtime/frame.inline.hpp ---- openjdk6/hotspot/src/share/vm/runtime/frame.inline.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/frame.inline.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)frame.inline.hpp 1.23 07/05/05 17:06:47 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/globals.cpp openjdk/hotspot/src/share/vm/runtime/globals.cpp ---- openjdk6/hotspot/src/share/vm/runtime/globals.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/globals.cpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)globals.cpp 1.50 07/09/13 20:51:49 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -430,4 +427,3 @@ - } - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/globals.hpp openjdk/hotspot/src/share/vm/runtime/globals.hpp ---- openjdk6/hotspot/src/share/vm/runtime/globals.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)globals.hpp 1.975 08/08/28 22:07:15 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1418,7 +1415,7 @@ - "CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence" \ - " ratio") \ - \ -- product(bool, CMSPrecleanRefLists1, false, \ -+ product(bool, CMSPrecleanRefLists1, true, \ - "Preclean ref lists during (initial) preclean phase") \ - \ - product(bool, CMSPrecleanRefLists2, false, \ -@@ -3209,5 +3206,3 @@ - RUNTIME_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG) - - RUNTIME_OS_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG) -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/globals_extension.hpp openjdk/hotspot/src/share/vm/runtime/globals_extension.hpp ---- openjdk6/hotspot/src/share/vm/runtime/globals_extension.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/globals_extension.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)globals_extension.hpp 1.17 07/05/17 16:05:46 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/handles.cpp openjdk/hotspot/src/share/vm/runtime/handles.cpp ---- openjdk6/hotspot/src/share/vm/runtime/handles.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/handles.cpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)handles.cpp 1.110 07/05/05 17:06:42 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/handles.hpp openjdk/hotspot/src/share/vm/runtime/handles.hpp ---- openjdk6/hotspot/src/share/vm/runtime/handles.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/handles.hpp 2008-12-05 16:41:22.217638812 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)handles.hpp 1.120 07/05/05 17:06:47 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -349,4 +346,3 @@ - ~ResetNoHandleMark() {} - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/handles.inline.hpp openjdk/hotspot/src/share/vm/runtime/handles.inline.hpp ---- openjdk6/hotspot/src/share/vm/runtime/handles.inline.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/handles.inline.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)handles.inline.hpp 1.28 07/05/05 17:06:48 JVM" --#endif - /* - * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/hpi.cpp openjdk/hotspot/src/share/vm/runtime/hpi.cpp ---- openjdk6/hotspot/src/share/vm/runtime/hpi.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/hpi.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)hpi.cpp 1.18 07/05/17 16:05:48 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/hpi.hpp openjdk/hotspot/src/share/vm/runtime/hpi.hpp ---- openjdk6/hotspot/src/share/vm/runtime/hpi.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/hpi.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)hpi.hpp 1.22 07/05/05 17:06:48 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/icache.cpp openjdk/hotspot/src/share/vm/runtime/icache.cpp ---- openjdk6/hotspot/src/share/vm/runtime/icache.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/icache.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)icache.cpp 1.23 07/05/05 17:06:49 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/icache.hpp openjdk/hotspot/src/share/vm/runtime/icache.hpp ---- openjdk6/hotspot/src/share/vm/runtime/icache.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/icache.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)icache.hpp 1.18 07/05/05 17:06:44 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/init.cpp openjdk/hotspot/src/share/vm/runtime/init.cpp ---- openjdk6/hotspot/src/share/vm/runtime/init.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/init.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)init.cpp 1.124 07/08/31 14:03:12 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/init.hpp openjdk/hotspot/src/share/vm/runtime/init.hpp ---- openjdk6/hotspot/src/share/vm/runtime/init.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/init.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)init.hpp 1.19 07/05/05 17:06:49 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/interfaceSupport.cpp openjdk/hotspot/src/share/vm/runtime/interfaceSupport.cpp ---- openjdk6/hotspot/src/share/vm/runtime/interfaceSupport.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)interfaceSupport.cpp 1.91 07/05/05 17:06:50 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -270,4 +267,3 @@ - } - #endif - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/interfaceSupport.hpp openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp ---- openjdk6/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)interfaceSupport.hpp 1.176 07/05/17 16:05:52 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp ---- openjdk6/hotspot/src/share/vm/runtime/java.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/java.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)java.cpp 1.223 07/07/16 14:37:42 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/java.hpp openjdk/hotspot/src/share/vm/runtime/java.hpp ---- openjdk6/hotspot/src/share/vm/runtime/java.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/java.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)java.hpp 1.38 07/08/21 18:54:50 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/javaCalls.cpp openjdk/hotspot/src/share/vm/runtime/javaCalls.cpp ---- openjdk6/hotspot/src/share/vm/runtime/javaCalls.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/javaCalls.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)javaCalls.cpp 1.220 07/05/05 17:06:51 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/javaCalls.hpp openjdk/hotspot/src/share/vm/runtime/javaCalls.hpp ---- openjdk6/hotspot/src/share/vm/runtime/javaCalls.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/javaCalls.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)javaCalls.hpp 1.81 07/05/05 17:06:47 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -196,4 +193,3 @@ - // Low-level interface - static void call(JavaValue* result, methodHandle method, JavaCallArguments* args, TRAPS); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp openjdk/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp ---- openjdk6/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)javaFrameAnchor.hpp 1.17 07/08/29 13:42:29 JVM" --#endif - /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -88,4 +85,3 @@ - static ByteSize last_Java_pc_offset() { return byte_offset_of(JavaFrameAnchor, _last_Java_pc); } - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp openjdk/hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp ---- openjdk6/hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/jfieldIDWorkaround.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jfieldIDWorkaround.hpp 1.11 07/05/05 17:06:51 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/jniHandles.cpp openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp ---- openjdk6/hotspot/src/share/vm/runtime/jniHandles.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jniHandles.cpp 1.64 07/05/17 16:06:13 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/jniHandles.hpp openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp ---- openjdk6/hotspot/src/share/vm/runtime/jniHandles.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jniHandles.hpp 1.54 07/05/17 16:06:14 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -213,5 +210,3 @@ - *((oop*)handle) = deleted_handle(); // Mark the handle as deleted, allocate will reuse it - } - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp openjdk/hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp ---- openjdk6/hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jniPeriodicChecker.cpp 1.4 07/05/05 17:06:51 JVM" --#endif - /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/jniPeriodicChecker.hpp openjdk/hotspot/src/share/vm/runtime/jniPeriodicChecker.hpp ---- openjdk6/hotspot/src/share/vm/runtime/jniPeriodicChecker.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/jniPeriodicChecker.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jniPeriodicChecker.hpp 1.4 07/05/05 17:06:51 JVM" --#endif - /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/memprofiler.cpp openjdk/hotspot/src/share/vm/runtime/memprofiler.cpp ---- openjdk6/hotspot/src/share/vm/runtime/memprofiler.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/memprofiler.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)memprofiler.cpp 1.24 07/05/05 17:06:52 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/memprofiler.hpp openjdk/hotspot/src/share/vm/runtime/memprofiler.hpp ---- openjdk6/hotspot/src/share/vm/runtime/memprofiler.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/memprofiler.hpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)memprofiler.hpp 1.17 07/05/05 17:06:52 JVM" --#endif - /* - * Copyright 1998 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/monitorChunk.cpp openjdk/hotspot/src/share/vm/runtime/monitorChunk.cpp ---- openjdk6/hotspot/src/share/vm/runtime/monitorChunk.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/monitorChunk.cpp 2008-12-05 16:41:22.227638963 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)monitorChunk.cpp 1.19 07/05/05 17:06:52 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -45,4 +42,3 @@ - at(index)->oops_do(f); - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/monitorChunk.hpp openjdk/hotspot/src/share/vm/runtime/monitorChunk.hpp ---- openjdk6/hotspot/src/share/vm/runtime/monitorChunk.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/monitorChunk.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)monitorChunk.hpp 1.19 07/05/05 17:06:52 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/mutex.cpp openjdk/hotspot/src/share/vm/runtime/mutex.cpp ---- openjdk6/hotspot/src/share/vm/runtime/mutex.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/mutex.cpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)mutex.cpp 1.73 07/07/10 14:13:50 JVM" --#endif - - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/mutex.hpp openjdk/hotspot/src/share/vm/runtime/mutex.hpp ---- openjdk6/hotspot/src/share/vm/runtime/mutex.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/mutex.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)mutex.hpp 1.70 07/07/09 15:32:56 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -319,4 +316,3 @@ - static Parker * volatile FreeList ; - static volatile int ListLock ; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/mutexLocker.cpp openjdk/hotspot/src/share/vm/runtime/mutexLocker.cpp ---- openjdk6/hotspot/src/share/vm/runtime/mutexLocker.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/mutexLocker.cpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)mutexLocker.cpp 1.181 07/07/11 13:22:55 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -267,4 +264,3 @@ - } - if (none) st->print_cr("None"); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/mutexLocker.hpp openjdk/hotspot/src/share/vm/runtime/mutexLocker.hpp ---- openjdk6/hotspot/src/share/vm/runtime/mutexLocker.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/mutexLocker.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)mutexLocker.hpp 1.152 07/07/09 15:31:19 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -326,4 +323,3 @@ - }; - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/objectMonitor.hpp openjdk/hotspot/src/share/vm/runtime/objectMonitor.hpp ---- openjdk6/hotspot/src/share/vm/runtime/objectMonitor.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/objectMonitor.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)objectMonitor.hpp 1.42 07/06/29 04:12:40 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -209,7 +206,3 @@ - intptr_t StatA, StatsB ; - - }; -- -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp openjdk/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp ---- openjdk6/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)objectMonitor.inline.hpp 1.24 07/05/05 17:06:52 JVM" --#endif - /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/orderAccess.cpp openjdk/hotspot/src/share/vm/runtime/orderAccess.cpp ---- openjdk6/hotspot/src/share/vm/runtime/orderAccess.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/orderAccess.cpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)orderAccess.cpp 1.9 07/05/05 17:06:53 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/orderAccess.hpp openjdk/hotspot/src/share/vm/runtime/orderAccess.hpp ---- openjdk6/hotspot/src/share/vm/runtime/orderAccess.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/orderAccess.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)orderAccess.hpp 1.11 07/05/05 17:06:52 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp ---- openjdk6/hotspot/src/share/vm/runtime/os.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)os.cpp 1.185 07/10/04 10:49:22 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/os.hpp openjdk/hotspot/src/share/vm/runtime/os.hpp ---- openjdk6/hotspot/src/share/vm/runtime/os.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/os.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)os.hpp 1.223 07/10/04 10:49:22 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -597,5 +594,3 @@ - extern "C" int SpinPause () ; - extern "C" int SafeFetch32 (int * adr, int errValue) ; - extern "C" intptr_t SafeFetchN (intptr_t * adr, intptr_t errValue) ; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/osThread.cpp openjdk/hotspot/src/share/vm/runtime/osThread.cpp ---- openjdk6/hotspot/src/share/vm/runtime/osThread.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/osThread.cpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)osThread.cpp 1.29 07/05/05 17:06:53 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -56,4 +53,3 @@ - default: st->print("unknown state %d", _state); break; - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/osThread.hpp openjdk/hotspot/src/share/vm/runtime/osThread.hpp ---- openjdk6/hotspot/src/share/vm/runtime/osThread.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/osThread.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)osThread.hpp 1.40 07/05/05 17:06:53 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/perfData.cpp openjdk/hotspot/src/share/vm/runtime/perfData.cpp ---- openjdk6/hotspot/src/share/vm/runtime/perfData.cpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/perfData.cpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)perfData.cpp 1.22 07/05/05 17:06:52 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/perfData.hpp openjdk/hotspot/src/share/vm/runtime/perfData.hpp ---- openjdk6/hotspot/src/share/vm/runtime/perfData.hpp 2008-11-25 10:12:12.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/perfData.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)perfData.hpp 1.24 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/perfMemory.cpp openjdk/hotspot/src/share/vm/runtime/perfMemory.cpp ---- openjdk6/hotspot/src/share/vm/runtime/perfMemory.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/perfMemory.cpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)perfMemory.cpp 1.28 07/09/13 11:29:49 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -249,4 +246,3 @@ - - return dest_file; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/perfMemory.hpp openjdk/hotspot/src/share/vm/runtime/perfMemory.hpp ---- openjdk6/hotspot/src/share/vm/runtime/perfMemory.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/perfMemory.hpp 2008-12-05 16:41:22.237639114 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)perfMemory.hpp 1.23 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/prefetch.hpp openjdk/hotspot/src/share/vm/runtime/prefetch.hpp ---- openjdk6/hotspot/src/share/vm/runtime/prefetch.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/prefetch.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)prefetch.hpp 1.9 07/05/05 17:06:53 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp ---- openjdk6/hotspot/src/share/vm/runtime/reflection.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)reflection.cpp 1.179 07/08/09 09:12:05 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/reflection.hpp openjdk/hotspot/src/share/vm/runtime/reflection.hpp ---- openjdk6/hotspot/src/share/vm/runtime/reflection.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/reflection.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)reflection.hpp 1.46 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -163,4 +160,3 @@ - #endif /* SUPPORT_OLD_REFLECTION */ - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/reflectionCompat.hpp openjdk/hotspot/src/share/vm/runtime/reflectionCompat.hpp ---- openjdk6/hotspot/src/share/vm/runtime/reflectionCompat.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/reflectionCompat.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)reflectionCompat.hpp 1.14 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/reflectionUtils.cpp openjdk/hotspot/src/share/vm/runtime/reflectionUtils.cpp ---- openjdk6/hotspot/src/share/vm/runtime/reflectionUtils.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/reflectionUtils.cpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)reflectionUtils.cpp 1.15 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/reflectionUtils.hpp openjdk/hotspot/src/share/vm/runtime/reflectionUtils.hpp ---- openjdk6/hotspot/src/share/vm/runtime/reflectionUtils.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/reflectionUtils.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)reflectionUtils.hpp 1.16 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/registerMap.hpp openjdk/hotspot/src/share/vm/runtime/registerMap.hpp ---- openjdk6/hotspot/src/share/vm/runtime/registerMap.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/registerMap.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)registerMap.hpp 1.16 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/relocator.cpp openjdk/hotspot/src/share/vm/runtime/relocator.cpp ---- openjdk6/hotspot/src/share/vm/runtime/relocator.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/relocator.cpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)relocator.cpp 1.40 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/relocator.hpp openjdk/hotspot/src/share/vm/runtime/relocator.hpp ---- openjdk6/hotspot/src/share/vm/runtime/relocator.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/relocator.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)relocator.hpp 1.27 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -119,4 +116,3 @@ - _listener->relocated(bci, delta, new_code_length); - } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/rframe.cpp openjdk/hotspot/src/share/vm/runtime/rframe.cpp ---- openjdk6/hotspot/src/share/vm/runtime/rframe.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/rframe.cpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)rframe.cpp 1.41 07/05/05 17:06:52 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -171,4 +168,3 @@ - void DeoptimizedRFrame::print() { - RFrame::print("deopt."); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/rframe.hpp openjdk/hotspot/src/share/vm/runtime/rframe.hpp ---- openjdk6/hotspot/src/share/vm/runtime/rframe.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/rframe.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)rframe.hpp 1.23 07/05/05 17:06:49 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -118,5 +115,3 @@ - public: - void print(); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/safepoint.cpp openjdk/hotspot/src/share/vm/runtime/safepoint.cpp ---- openjdk6/hotspot/src/share/vm/runtime/safepoint.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)safepoint.cpp 1.308 07/09/04 11:20:17 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/safepoint.hpp openjdk/hotspot/src/share/vm/runtime/safepoint.hpp ---- openjdk6/hotspot/src/share/vm/runtime/safepoint.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/safepoint.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)safepoint.hpp 1.105 07/08/27 21:52:08 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp ---- openjdk6/hotspot/src/share/vm/runtime/sharedRuntime.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)sharedRuntime.cpp 1.383 08/05/13 16:13:34 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -470,11 +467,6 @@ - throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_AbstractMethodError()); - JRT_END - --JRT_ENTRY(void, SharedRuntime::throw_IncompatibleClassChangeError(JavaThread* thread)) -- // These errors occur only at call sites -- throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_IncompatibleClassChangeError(), "vtable stub"); --JRT_END -- - JRT_ENTRY(void, SharedRuntime::throw_ArithmeticException(JavaThread* thread)) - throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_ArithmeticException(), "/ by zero"); - JRT_END -@@ -1489,9 +1481,11 @@ - const char* desc = " cannot be cast to "; - size_t msglen = strlen(objName) + strlen(desc) + strlen(targetKlassName) + 1; - -- char* message = NEW_RESOURCE_ARRAY(char, msglen); -+ char* message = NEW_C_HEAP_ARRAY(char, msglen); - if (NULL == message) { -- // Shouldn't happen, but don't cause even more problems if it does -+ // out of memory - can't use a detailed message. Since caller is -+ // using a resource mark to free memory, returning this should be -+ // safe (caller won't explicitly delete it). - message = const_cast(objName); - } else { - jio_snprintf(message, msglen, "%s%s%s", objName, desc, targetKlassName); -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/sharedRuntime.hpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.hpp ---- openjdk6/hotspot/src/share/vm/runtime/sharedRuntime.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.hpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)sharedRuntime.hpp 1.158 07/10/05 19:47:48 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -107,7 +104,6 @@ - STACK_OVERFLOW - }; - static void throw_AbstractMethodError(JavaThread* thread); -- static void throw_IncompatibleClassChangeError(JavaThread* thread); - static void throw_ArithmeticException(JavaThread* thread); - static void throw_NullPointerException(JavaThread* thread); - static void throw_NullPointerException_at_call(JavaThread* thread); -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp ---- openjdk6/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp 2008-12-05 16:41:22.247639265 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)sharedRuntimeTrans.cpp 1.8 07/05/05 17:06:54 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp ---- openjdk6/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)sharedRuntimeTrig.cpp 1.16 07/05/05 17:06:55 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/signature.cpp openjdk/hotspot/src/share/vm/runtime/signature.cpp ---- openjdk6/hotspot/src/share/vm/runtime/signature.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/signature.cpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)signature.cpp 1.43 07/05/05 17:06:56 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/signature.hpp openjdk/hotspot/src/share/vm/runtime/signature.hpp ---- openjdk6/hotspot/src/share/vm/runtime/signature.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/signature.hpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)signature.hpp 1.50 07/05/05 17:06:56 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/stackValue.cpp openjdk/hotspot/src/share/vm/runtime/stackValue.cpp ---- openjdk6/hotspot/src/share/vm/runtime/stackValue.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/stackValue.cpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)stackValue.cpp 1.28 07/05/24 14:38:39 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -181,4 +178,3 @@ - } - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/stackValue.hpp openjdk/hotspot/src/share/vm/runtime/stackValue.hpp ---- openjdk6/hotspot/src/share/vm/runtime/stackValue.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/stackValue.hpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)stackValue.hpp 1.37 07/05/24 14:38:39 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -102,4 +99,3 @@ - void print_on(outputStream* st) const; - #endif - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/stackValueCollection.cpp openjdk/hotspot/src/share/vm/runtime/stackValueCollection.cpp ---- openjdk6/hotspot/src/share/vm/runtime/stackValueCollection.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/stackValueCollection.cpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)stackValueCollection.cpp 1.18 07/05/05 17:06:53 JVM" --#endif - /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/stackValueCollection.hpp openjdk/hotspot/src/share/vm/runtime/stackValueCollection.hpp ---- openjdk6/hotspot/src/share/vm/runtime/stackValueCollection.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/stackValueCollection.hpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)stackValueCollection.hpp 1.14 07/05/05 17:06:58 JVM" --#endif - /* - * Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/statSampler.cpp openjdk/hotspot/src/share/vm/runtime/statSampler.cpp ---- openjdk6/hotspot/src/share/vm/runtime/statSampler.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/statSampler.cpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)statSampler.cpp 1.24 07/05/05 17:06:58 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -360,4 +357,3 @@ - - StatSampler::destroy(); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/statSampler.hpp openjdk/hotspot/src/share/vm/runtime/statSampler.hpp ---- openjdk6/hotspot/src/share/vm/runtime/statSampler.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/statSampler.hpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)statSampler.hpp 1.12 07/05/05 17:06:58 JVM" --#endif - /* - * Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp ---- openjdk6/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)stubCodeGenerator.cpp 1.30 07/05/17 16:06:31 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -146,4 +143,3 @@ - JvmtiExport::post_dynamic_code_generated(_cdesc->name(), _cdesc->begin(), _cdesc->end()); - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp ---- openjdk6/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)stubCodeGenerator.hpp 1.25 07/05/17 16:06:33 JVM" --#endif - /* - * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -121,4 +118,3 @@ - ~StubCodeMark(); - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/stubRoutines.cpp openjdk/hotspot/src/share/vm/runtime/stubRoutines.cpp ---- openjdk6/hotspot/src/share/vm/runtime/stubRoutines.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/stubRoutines.cpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)stubRoutines.cpp 1.115 07/07/19 12:19:08 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -43,7 +40,6 @@ - address StubRoutines::_catch_exception_entry = NULL; - address StubRoutines::_forward_exception_entry = NULL; - address StubRoutines::_throw_AbstractMethodError_entry = NULL; --address StubRoutines::_throw_IncompatibleClassChangeError_entry = NULL; - address StubRoutines::_throw_ArithmeticException_entry = NULL; - address StubRoutines::_throw_NullPointerException_entry = NULL; - address StubRoutines::_throw_NullPointerException_at_call_entry = NULL; -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/stubRoutines.hpp openjdk/hotspot/src/share/vm/runtime/stubRoutines.hpp ---- openjdk6/hotspot/src/share/vm/runtime/stubRoutines.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/stubRoutines.hpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)stubRoutines.hpp 1.118 07/10/05 19:48:47 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -87,7 +84,6 @@ - static address _forward_exception_entry; - static address _catch_exception_entry; - static address _throw_AbstractMethodError_entry; -- static address _throw_IncompatibleClassChangeError_entry; - static address _throw_ArithmeticException_entry; - static address _throw_NullPointerException_entry; - static address _throw_NullPointerException_at_call_entry; -@@ -188,7 +184,6 @@ - static address forward_exception_entry() { return _forward_exception_entry; } - // Implicit exceptions - static address throw_AbstractMethodError_entry() { return _throw_AbstractMethodError_entry; } -- static address throw_IncompatibleClassChangeError_entry(){ return _throw_IncompatibleClassChangeError_entry; } - static address throw_ArithmeticException_entry() { return _throw_ArithmeticException_entry; } - static address throw_NullPointerException_entry() { return _throw_NullPointerException_entry; } - static address throw_NullPointerException_at_call_entry(){ return _throw_NullPointerException_at_call_entry; } -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/sweeper.cpp openjdk/hotspot/src/share/vm/runtime/sweeper.cpp ---- openjdk6/hotspot/src/share/vm/runtime/sweeper.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/sweeper.cpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)sweeper.cpp 1.39 07/05/05 17:06:50 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/sweeper.hpp openjdk/hotspot/src/share/vm/runtime/sweeper.hpp ---- openjdk6/hotspot/src/share/vm/runtime/sweeper.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/sweeper.hpp 2008-12-05 16:41:22.257639416 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)sweeper.hpp 1.26 07/05/05 17:06:59 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/synchronizer.cpp openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp ---- openjdk6/hotspot/src/share/vm/runtime/synchronizer.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)synchronizer.cpp 1.117 07/09/29 02:14:43 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -4717,6 +4714,3 @@ - } - - #endif -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/synchronizer.hpp openjdk/hotspot/src/share/vm/runtime/synchronizer.hpp ---- openjdk6/hotspot/src/share/vm/runtime/synchronizer.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/synchronizer.hpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)synchronizer.hpp 1.71 07/05/26 16:04:34 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/task.cpp openjdk/hotspot/src/share/vm/runtime/task.cpp ---- openjdk6/hotspot/src/share/vm/runtime/task.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/task.cpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)task.cpp 1.27 07/05/05 17:06:59 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/task.hpp openjdk/hotspot/src/share/vm/runtime/task.hpp ---- openjdk6/hotspot/src/share/vm/runtime/task.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/task.hpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)task.hpp 1.23 07/05/05 17:06:59 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/thread.cpp openjdk/hotspot/src/share/vm/runtime/thread.cpp ---- openjdk6/hotspot/src/share/vm/runtime/thread.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/thread.cpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)thread.cpp 1.819 07/11/02 18:02:02 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -2928,25 +2925,6 @@ - warning("java.lang.String not initialized"); - } - -- if (AggressiveOpts) { -- // Forcibly initialize java/util/HashMap and mutate the private -- // static final "frontCacheEnabled" field before we start creating instances --#ifdef ASSERT -- klassOop tmp_k = SystemDictionary::find(vmSymbolHandles::java_util_HashMap(), Handle(), Handle(), CHECK_0); -- assert(tmp_k == NULL, "java/util/HashMap should not be loaded yet"); --#endif -- klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_util_HashMap(), Handle(), Handle(), CHECK_0); -- KlassHandle k = KlassHandle(THREAD, k_o); -- guarantee(k.not_null(), "Must find java/util/HashMap"); -- instanceKlassHandle ik = instanceKlassHandle(THREAD, k()); -- ik->initialize(CHECK_0); -- fieldDescriptor fd; -- // Possible we might not find this field; if so, don't break -- if (ik->find_local_field(vmSymbols::frontCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) { -- k()->bool_field_put(fd.offset(), true); -- } -- } -- - // Initialize java_lang.System (needed before creating the thread) - if (InitializeJavaLangSystem) { - initialize_class(vmSymbolHandles::java_lang_System(), CHECK_0); -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/thread.hpp openjdk/hotspot/src/share/vm/runtime/thread.hpp ---- openjdk6/hotspot/src/share/vm/runtime/thread.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/thread.hpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)thread.hpp 1.456 07/09/28 10:22:58 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1758,5 +1755,3 @@ - static ParkEvent * Allocate (Thread * t) ; - static void Release (ParkEvent * e) ; - } ; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/threadCritical.hpp openjdk/hotspot/src/share/vm/runtime/threadCritical.hpp ---- openjdk6/hotspot/src/share/vm/runtime/threadCritical.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/threadCritical.hpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)threadCritical.hpp 1.13 07/05/05 17:07:00 JVM" --#endif - /* - * Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -54,5 +51,3 @@ - ThreadCritical(); - ~ThreadCritical(); - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/threadLocalStorage.cpp openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.cpp ---- openjdk6/hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)threadLocalStorage.cpp 1.46 07/05/05 17:07:00 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -50,4 +47,3 @@ - set_thread_index(os::allocate_thread_local_storage()); - generate_code_for_get_thread(); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/threadLocalStorage.hpp openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.hpp ---- openjdk6/hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)threadLocalStorage.hpp 1.45 07/05/05 17:07:00 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -63,4 +60,3 @@ - static void pd_invalidate_all(); - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/timer.cpp openjdk/hotspot/src/share/vm/runtime/timer.cpp ---- openjdk6/hotspot/src/share/vm/runtime/timer.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/timer.cpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)timer.cpp 1.33 07/05/05 17:06:59 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/timer.hpp openjdk/hotspot/src/share/vm/runtime/timer.hpp ---- openjdk6/hotspot/src/share/vm/runtime/timer.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/timer.hpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)timer.hpp 1.36 07/05/05 17:06:59 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/unhandledOops.cpp openjdk/hotspot/src/share/vm/runtime/unhandledOops.cpp ---- openjdk6/hotspot/src/share/vm/runtime/unhandledOops.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/unhandledOops.cpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)unhandledOops.cpp 1.11 07/05/05 17:07:00 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/unhandledOops.hpp openjdk/hotspot/src/share/vm/runtime/unhandledOops.hpp ---- openjdk6/hotspot/src/share/vm/runtime/unhandledOops.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/unhandledOops.hpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)unhandledOops.hpp 1.7 07/05/05 17:07:01 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vframe.cpp openjdk/hotspot/src/share/vm/runtime/vframe.cpp ---- openjdk6/hotspot/src/share/vm/runtime/vframe.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vframe.cpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vframe.cpp 1.163 07/08/29 13:42:30 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vframe.hpp openjdk/hotspot/src/share/vm/runtime/vframe.hpp ---- openjdk6/hotspot/src/share/vm/runtime/vframe.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vframe.hpp 2008-12-05 16:41:22.267639567 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vframe.hpp 1.89 07/05/17 16:07:04 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vframeArray.cpp openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp ---- openjdk6/hotspot/src/share/vm/runtime/vframeArray.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vframeArray.cpp 1.145 07/08/29 13:42:30 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vframeArray.hpp openjdk/hotspot/src/share/vm/runtime/vframeArray.hpp ---- openjdk6/hotspot/src/share/vm/runtime/vframeArray.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vframeArray.hpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vframeArray.hpp 1.77 07/05/05 17:07:01 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -202,4 +199,3 @@ - #endif - - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vframe_hp.cpp openjdk/hotspot/src/share/vm/runtime/vframe_hp.cpp ---- openjdk6/hotspot/src/share/vm/runtime/vframe_hp.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vframe_hp.cpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vframe_hp.cpp 1.159 07/05/24 14:38:39 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vframe_hp.hpp openjdk/hotspot/src/share/vm/runtime/vframe_hp.hpp ---- openjdk6/hotspot/src/share/vm/runtime/vframe_hp.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vframe_hp.hpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vframe_hp.hpp 1.54 07/05/05 17:07:01 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/virtualspace.cpp openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp ---- openjdk6/hotspot/src/share/vm/runtime/virtualspace.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)virtualspace.cpp 1.63 07/10/04 10:49:29 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -705,4 +702,3 @@ - } - - #endif -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/virtualspace.hpp openjdk/hotspot/src/share/vm/runtime/virtualspace.hpp ---- openjdk6/hotspot/src/share/vm/runtime/virtualspace.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/virtualspace.hpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)virtualspace.hpp 1.42 07/10/04 10:49:29 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vmStructs.cpp openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp ---- openjdk6/hotspot/src/share/vm/runtime/vmStructs.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmStructs.cpp 1.189 08/04/09 19:20:08 JVM" --#endif - /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -896,7 +893,6 @@ - /*******************************************************************/ \ - \ - declare_unsigned_integer_type(size_t) \ -- declare_integer_type(ssize_t) \ - declare_unsigned_integer_type(const size_t) \ - declare_integer_type(intx) \ - declare_integer_type(intptr_t) \ -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vmStructs.hpp openjdk/hotspot/src/share/vm/runtime/vmStructs.hpp ---- openjdk6/hotspot/src/share/vm/runtime/vmStructs.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.hpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmStructs.hpp 1.13 07/05/05 17:07:02 JVM" --#endif - /* - * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vmThread.cpp openjdk/hotspot/src/share/vm/runtime/vmThread.cpp ---- openjdk6/hotspot/src/share/vm/runtime/vmThread.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vmThread.cpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmThread.cpp 1.92 07/08/27 21:52:08 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vmThread.hpp openjdk/hotspot/src/share/vm/runtime/vmThread.hpp ---- openjdk6/hotspot/src/share/vm/runtime/vmThread.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vmThread.hpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmThread.hpp 1.40 07/05/05 17:07:03 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -149,5 +146,3 @@ - // Pointer to single-instance of VM thread - static VMThread* _vm_thread; - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vm_operations.cpp openjdk/hotspot/src/share/vm/runtime/vm_operations.cpp ---- openjdk6/hotspot/src/share/vm/runtime/vm_operations.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vm_operations.cpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vm_operations.cpp 1.192 07/05/23 10:54:18 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vm_operations.hpp openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp ---- openjdk6/hotspot/src/share/vm/runtime/vm_operations.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vm_operations.hpp 1.130 07/05/23 10:54:21 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp ---- openjdk6/hotspot/src/share/vm/runtime/vm_version.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vm_version.cpp 1.59 07/08/17 11:47:16 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vm_version.hpp openjdk/hotspot/src/share/vm/runtime/vm_version.hpp ---- openjdk6/hotspot/src/share/vm/runtime/vm_version.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vm_version.hpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vm_version.hpp 1.28 07/10/04 10:49:20 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -73,4 +70,3 @@ - // that the O/S may support more sizes, but at most this many are used. - static uint page_size_count() { return 2; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/runtime/vtune.hpp openjdk/hotspot/src/share/vm/runtime/vtune.hpp ---- openjdk6/hotspot/src/share/vm/runtime/vtune.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/vtune.hpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vtune.hpp 1.20 07/05/05 17:07:01 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -56,4 +53,3 @@ - VTuneClassLoadMarker() { VTune::start_class_load(); } - ~VTuneClassLoadMarker() { VTune::end_class_load(); } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/services/attachListener.cpp openjdk/hotspot/src/share/vm/services/attachListener.cpp ---- openjdk6/hotspot/src/share/vm/services/attachListener.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/attachListener.cpp 2008-12-05 16:41:22.277639718 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)attachListener.cpp 1.24 07/06/30 11:09:32 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/attachListener.hpp openjdk/hotspot/src/share/vm/services/attachListener.hpp ---- openjdk6/hotspot/src/share/vm/services/attachListener.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/attachListener.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)attachListener.hpp 1.12 07/07/11 11:24:45 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/classLoadingService.cpp openjdk/hotspot/src/share/vm/services/classLoadingService.cpp ---- openjdk6/hotspot/src/share/vm/services/classLoadingService.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/classLoadingService.cpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)classLoadingService.cpp 1.15 07/05/05 17:07:04 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/classLoadingService.hpp openjdk/hotspot/src/share/vm/services/classLoadingService.hpp ---- openjdk6/hotspot/src/share/vm/services/classLoadingService.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/classLoadingService.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)classLoadingService.hpp 1.10 07/05/05 17:07:05 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -136,4 +133,3 @@ - _loaded_classes->append(h); - } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/services/dtraceAttacher.cpp openjdk/hotspot/src/share/vm/services/dtraceAttacher.cpp ---- openjdk6/hotspot/src/share/vm/services/dtraceAttacher.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/dtraceAttacher.cpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dtraceAttacher.cpp 1.8 07/05/23 10:54:23 JVM" --#endif - /* - * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/dtraceAttacher.hpp openjdk/hotspot/src/share/vm/services/dtraceAttacher.hpp ---- openjdk6/hotspot/src/share/vm/services/dtraceAttacher.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/dtraceAttacher.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)dtraceAttacher.hpp 1.5 07/05/05 17:07:05 JVM" --#endif - /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -45,4 +42,3 @@ - // set ExtendedDTraceProbes flag - static void set_extended_dprobes(bool value); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/services/heapDumper.cpp openjdk/hotspot/src/share/vm/services/heapDumper.cpp ---- openjdk6/hotspot/src/share/vm/services/heapDumper.cpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/heapDumper.cpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)heapDumper.cpp 1.24 07/07/22 22:35:59 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1774,4 +1771,3 @@ - true /* send to tty */); - dumper.dump(path); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/services/heapDumper.hpp openjdk/hotspot/src/share/vm/services/heapDumper.hpp ---- openjdk6/hotspot/src/share/vm/services/heapDumper.hpp 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/heapDumper.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)heapDumper.hpp 1.11 07/07/02 11:45:25 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/jmm.h openjdk/hotspot/src/share/vm/services/jmm.h ---- openjdk6/hotspot/src/share/vm/services/jmm.h 2008-11-25 10:12:13.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/jmm.h 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jmm.h 1.36 07/05/05 17:07:04 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -288,4 +285,3 @@ - #endif /* __cplusplus */ - - #endif /* !_JAVA_JMM_H_ */ -- -diff -ruNb openjdk6/hotspot/src/share/vm/services/lowMemoryDetector.cpp openjdk/hotspot/src/share/vm/services/lowMemoryDetector.cpp ---- openjdk6/hotspot/src/share/vm/services/lowMemoryDetector.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/lowMemoryDetector.cpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)lowMemoryDetector.cpp 1.28 07/05/05 17:07:04 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/lowMemoryDetector.hpp openjdk/hotspot/src/share/vm/services/lowMemoryDetector.hpp ---- openjdk6/hotspot/src/share/vm/services/lowMemoryDetector.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/lowMemoryDetector.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)lowMemoryDetector.hpp 1.22 07/05/05 17:07:05 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/management.cpp openjdk/hotspot/src/share/vm/services/management.cpp ---- openjdk6/hotspot/src/share/vm/services/management.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/management.cpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)management.cpp 1.86 07/08/27 14:10:24 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/management.hpp openjdk/hotspot/src/share/vm/services/management.hpp ---- openjdk6/hotspot/src/share/vm/services/management.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/management.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)management.hpp 1.23 07/05/05 17:07:05 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/memoryManager.cpp openjdk/hotspot/src/share/vm/services/memoryManager.cpp ---- openjdk6/hotspot/src/share/vm/services/memoryManager.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/memoryManager.cpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)memoryManager.cpp 1.28 07/05/05 17:07:05 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/memoryManager.hpp openjdk/hotspot/src/share/vm/services/memoryManager.hpp ---- openjdk6/hotspot/src/share/vm/services/memoryManager.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/memoryManager.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)memoryManager.hpp 1.15 07/05/05 17:07:05 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/memoryPool.cpp openjdk/hotspot/src/share/vm/services/memoryPool.cpp ---- openjdk6/hotspot/src/share/vm/services/memoryPool.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/memoryPool.cpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)memoryPool.cpp 1.35 07/05/29 09:44:30 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/memoryPool.hpp openjdk/hotspot/src/share/vm/services/memoryPool.hpp ---- openjdk6/hotspot/src/share/vm/services/memoryPool.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/memoryPool.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)memoryPool.hpp 1.25 07/05/29 09:44:30 JVM" --#endif - /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/memoryService.cpp openjdk/hotspot/src/share/vm/services/memoryService.cpp ---- openjdk6/hotspot/src/share/vm/services/memoryService.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/memoryService.cpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)memoryService.cpp 1.35 07/05/29 09:44:30 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/memoryService.hpp openjdk/hotspot/src/share/vm/services/memoryService.hpp ---- openjdk6/hotspot/src/share/vm/services/memoryService.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/memoryService.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)memoryService.hpp 1.16 07/05/05 17:07:05 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/memoryUsage.hpp openjdk/hotspot/src/share/vm/services/memoryUsage.hpp ---- openjdk6/hotspot/src/share/vm/services/memoryUsage.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/memoryUsage.hpp 2008-12-05 16:41:22.287639868 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)memoryUsage.hpp 1.12 07/05/05 17:07:06 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/psMemoryPool.cpp openjdk/hotspot/src/share/vm/services/psMemoryPool.cpp ---- openjdk6/hotspot/src/share/vm/services/psMemoryPool.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/psMemoryPool.cpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)psMemoryPool.cpp 1.1 07/05/01 16:48:51 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/psMemoryPool.hpp openjdk/hotspot/src/share/vm/services/psMemoryPool.hpp ---- openjdk6/hotspot/src/share/vm/services/psMemoryPool.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/psMemoryPool.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)psMemoryPool.hpp 1.1 07/05/01 16:48:51 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/runtimeService.cpp openjdk/hotspot/src/share/vm/services/runtimeService.cpp ---- openjdk6/hotspot/src/share/vm/services/runtimeService.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/runtimeService.cpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)runtimeService.cpp 1.18 07/07/13 14:31:26 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/runtimeService.hpp openjdk/hotspot/src/share/vm/services/runtimeService.hpp ---- openjdk6/hotspot/src/share/vm/services/runtimeService.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/runtimeService.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)runtimeService.hpp 1.10 07/05/05 17:07:06 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/serviceUtil.hpp openjdk/hotspot/src/share/vm/services/serviceUtil.hpp ---- openjdk6/hotspot/src/share/vm/services/serviceUtil.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/serviceUtil.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)serviceUtil.hpp 1.8 07/05/05 17:07:06 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/threadService.cpp openjdk/hotspot/src/share/vm/services/threadService.cpp ---- openjdk6/hotspot/src/share/vm/services/threadService.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/threadService.cpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)threadService.cpp 1.54 07/05/17 16:07:12 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/services/threadService.hpp openjdk/hotspot/src/share/vm/services/threadService.hpp ---- openjdk6/hotspot/src/share/vm/services/threadService.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/services/threadService.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)threadService.hpp 1.43 07/10/03 11:09:53 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/accessFlags.cpp openjdk/hotspot/src/share/vm/utilities/accessFlags.cpp ---- openjdk6/hotspot/src/share/vm/utilities/accessFlags.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/accessFlags.cpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)accessFlags.cpp 1.25 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/accessFlags.hpp openjdk/hotspot/src/share/vm/utilities/accessFlags.hpp ---- openjdk6/hotspot/src/share/vm/utilities/accessFlags.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/accessFlags.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)accessFlags.hpp 1.68 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/array.cpp openjdk/hotspot/src/share/vm/utilities/array.cpp ---- openjdk6/hotspot/src/share/vm/utilities/array.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/array.cpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)array.cpp 1.20 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/array.hpp openjdk/hotspot/src/share/vm/utilities/array.hpp ---- openjdk6/hotspot/src/share/vm/utilities/array.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/array.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)array.hpp 1.15 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/bitMap.cpp openjdk/hotspot/src/share/vm/utilities/bitMap.cpp ---- openjdk6/hotspot/src/share/vm/utilities/bitMap.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)bitMap.cpp 1.48 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/bitMap.hpp openjdk/hotspot/src/share/vm/utilities/bitMap.hpp ---- openjdk6/hotspot/src/share/vm/utilities/bitMap.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/bitMap.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bitMap.hpp 1.46 07/06/18 14:25:28 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -397,4 +394,3 @@ - } - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/bitMap.inline.hpp openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp ---- openjdk6/hotspot/src/share/vm/utilities/bitMap.inline.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)bitMap.inline.hpp 1.8 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/constantTag.cpp openjdk/hotspot/src/share/vm/utilities/constantTag.cpp ---- openjdk6/hotspot/src/share/vm/utilities/constantTag.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/constantTag.cpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)constantTag.cpp 1.21 07/05/05 17:07:08 JVM" --#endif - /* - * Copyright 1997-1999 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/constantTag.hpp openjdk/hotspot/src/share/vm/utilities/constantTag.hpp ---- openjdk6/hotspot/src/share/vm/utilities/constantTag.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/constantTag.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)constantTag.hpp 1.28 07/05/05 17:07:08 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -87,4 +84,3 @@ - - void print_on(outputStream* st) const PRODUCT_RETURN; - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/copy.hpp openjdk/hotspot/src/share/vm/utilities/copy.hpp ---- openjdk6/hotspot/src/share/vm/utilities/copy.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/copy.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)copy.hpp 1.15 07/05/17 16:07:14 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/debug.cpp openjdk/hotspot/src/share/vm/utilities/debug.cpp ---- openjdk6/hotspot/src/share/vm/utilities/debug.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/debug.cpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)debug.cpp 1.183 07/07/02 11:45:25 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -937,4 +934,3 @@ - #endif - - #endif // PRODUCT -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/debug.hpp openjdk/hotspot/src/share/vm/utilities/debug.hpp ---- openjdk6/hotspot/src/share/vm/utilities/debug.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/debug.hpp 2008-12-05 16:41:22.297640019 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)debug.hpp 1.50 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/defaultStream.hpp openjdk/hotspot/src/share/vm/utilities/defaultStream.hpp ---- openjdk6/hotspot/src/share/vm/utilities/defaultStream.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/defaultStream.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)defaultStream.hpp 1.13 07/05/05 17:07:08 JVM" --#endif - /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/dtrace.hpp openjdk/hotspot/src/share/vm/utilities/dtrace.hpp ---- openjdk6/hotspot/src/share/vm/utilities/dtrace.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)dtrace.hpp 1.11 07/05/05 17:07:08 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -126,4 +123,3 @@ - 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)) -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/events.cpp openjdk/hotspot/src/share/vm/utilities/events.cpp ---- openjdk6/hotspot/src/share/vm/utilities/events.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/events.cpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)events.cpp 1.40 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -250,4 +247,3 @@ - int print_all_events(outputStream *st) { return 0; } - - #endif // PRODUCT -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/events.hpp openjdk/hotspot/src/share/vm/utilities/events.hpp ---- openjdk6/hotspot/src/share/vm/utilities/events.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/events.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)events.hpp 1.22 07/05/05 17:07:09 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -65,4 +62,3 @@ - }; - - int print_all_events(outputStream *st); -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/exceptions.cpp openjdk/hotspot/src/share/vm/utilities/exceptions.cpp ---- openjdk6/hotspot/src/share/vm/utilities/exceptions.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/exceptions.cpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)exceptions.cpp 1.100 07/09/13 11:29:49 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/exceptions.hpp openjdk/hotspot/src/share/vm/utilities/exceptions.hpp ---- openjdk6/hotspot/src/share/vm/utilities/exceptions.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/exceptions.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)exceptions.hpp 1.51 07/05/05 17:07:09 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -276,5 +273,3 @@ - // exceptions. - - #define EXCEPTION_MARK Thread* THREAD; ExceptionMark __em(THREAD); -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/globalDefinitions.cpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.cpp ---- openjdk6/hotspot/src/share/vm/utilities/globalDefinitions.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.cpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)globalDefinitions.cpp 1.48 07/05/05 17:07:09 JVM" --#endif - /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp ---- openjdk6/hotspot/src/share/vm/utilities/globalDefinitions.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)globalDefinitions.hpp 1.217 07/05/23 10:54:27 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ---- openjdk6/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)globalDefinitions_gcc.hpp 1.47 07/05/05 17:07:10 JVM" --#endif - /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -276,4 +273,3 @@ - # undef offsetof - #endif - #define offsetof(klass,field) offset_of(klass,field) -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp ---- openjdk6/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)globalDefinitions_sparcWorks.hpp 1.80 07/05/05 17:07:10 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp ---- openjdk6/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)globalDefinitions_visCPP.hpp 1.68 07/05/05 17:07:10 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/growableArray.cpp openjdk/hotspot/src/share/vm/utilities/growableArray.cpp ---- openjdk6/hotspot/src/share/vm/utilities/growableArray.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/growableArray.cpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)growableArray.cpp 1.37 07/05/05 17:07:10 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -54,4 +51,3 @@ - return _arena->Amalloc(elementSize * _max); - } - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/growableArray.hpp openjdk/hotspot/src/share/vm/utilities/growableArray.hpp ---- openjdk6/hotspot/src/share/vm/utilities/growableArray.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/growableArray.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)growableArray.hpp 1.55 07/05/05 17:07:09 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/hashtable.cpp openjdk/hotspot/src/share/vm/utilities/hashtable.cpp ---- openjdk6/hotspot/src/share/vm/utilities/hashtable.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.cpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)hashtable.cpp 1.13 07/05/05 17:07:10 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/hashtable.hpp openjdk/hotspot/src/share/vm/utilities/hashtable.hpp ---- openjdk6/hotspot/src/share/vm/utilities/hashtable.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)hashtable.hpp 1.14 07/05/05 17:07:10 JVM" --#endif - /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/hashtable.inline.hpp openjdk/hotspot/src/share/vm/utilities/hashtable.inline.hpp ---- openjdk6/hotspot/src/share/vm/utilities/hashtable.inline.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.inline.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)hashtable.inline.hpp 1.9 07/05/05 17:07:10 JVM" --#endif - /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/histogram.cpp openjdk/hotspot/src/share/vm/utilities/histogram.cpp ---- openjdk6/hotspot/src/share/vm/utilities/histogram.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/histogram.cpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)histogram.cpp 1.21 07/05/05 17:07:09 JVM" --#endif - /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/histogram.hpp openjdk/hotspot/src/share/vm/utilities/histogram.hpp ---- openjdk6/hotspot/src/share/vm/utilities/histogram.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/histogram.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)histogram.hpp 1.17 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 1998-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/macros.hpp openjdk/hotspot/src/share/vm/utilities/macros.hpp ---- openjdk6/hotspot/src/share/vm/utilities/macros.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/macros.hpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)macros.hpp 1.44 07/08/29 13:42:30 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -182,4 +179,3 @@ - #define FIX_THIS(code) report_assertion_failure("FIX_THIS",__FILE__, __LINE__, "") - - #define define_pd_global(type, name, value) const type pd_##name = value; -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/ostream.cpp openjdk/hotspot/src/share/vm/utilities/ostream.cpp ---- openjdk6/hotspot/src/share/vm/utilities/ostream.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2008-12-05 16:41:22.307640170 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)ostream.cpp 1.80 07/09/28 10:22:57 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/ostream.hpp openjdk/hotspot/src/share/vm/utilities/ostream.hpp ---- openjdk6/hotspot/src/share/vm/utilities/ostream.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/ostream.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)ostream.hpp 1.44 07/09/28 10:22:57 JVM" --#endif - /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/preserveException.cpp openjdk/hotspot/src/share/vm/utilities/preserveException.cpp ---- openjdk6/hotspot/src/share/vm/utilities/preserveException.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/preserveException.cpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)preserveException.cpp 1.21 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/preserveException.hpp openjdk/hotspot/src/share/vm/utilities/preserveException.hpp ---- openjdk6/hotspot/src/share/vm/utilities/preserveException.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/preserveException.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)preserveException.hpp 1.20 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/sizes.cpp openjdk/hotspot/src/share/vm/utilities/sizes.cpp ---- openjdk6/hotspot/src/share/vm/utilities/sizes.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/sizes.cpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)sizes.cpp 1.11 07/05/05 17:07:10 JVM" --#endif - /* - * Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/sizes.hpp openjdk/hotspot/src/share/vm/utilities/sizes.hpp ---- openjdk6/hotspot/src/share/vm/utilities/sizes.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/sizes.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)sizes.hpp 1.19 07/05/05 17:07:08 JVM" --#endif - /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -145,4 +142,3 @@ - // Use the following #define to get C++ field member offsets - - #define byte_offset_of(klass,field) in_ByteSize((int)offset_of(klass, field)) -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/taskqueue.cpp openjdk/hotspot/src/share/vm/utilities/taskqueue.cpp ---- openjdk6/hotspot/src/share/vm/utilities/taskqueue.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/taskqueue.cpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)taskqueue.cpp 1.21 06/08/10 17:56:51 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/taskqueue.hpp openjdk/hotspot/src/share/vm/utilities/taskqueue.hpp ---- openjdk6/hotspot/src/share/vm/utilities/taskqueue.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/taskqueue.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)taskqueue.hpp 1.33 06/08/10 17:56:52 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/top.hpp openjdk/hotspot/src/share/vm/utilities/top.hpp ---- openjdk6/hotspot/src/share/vm/utilities/top.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/top.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)top.hpp 1.16 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 1997 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/utf8.cpp openjdk/hotspot/src/share/vm/utilities/utf8.cpp ---- openjdk6/hotspot/src/share/vm/utilities/utf8.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/utf8.cpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)utf8.cpp 1.30 07/05/05 17:07:07 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -245,6 +242,3 @@ - } - *utf8_buffer = '\0'; - } -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/utf8.hpp openjdk/hotspot/src/share/vm/utilities/utf8.hpp ---- openjdk6/hotspot/src/share/vm/utilities/utf8.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/utf8.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)utf8.hpp 1.22 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp ---- openjdk6/hotspot/src/share/vm/utilities/vmError.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmError.cpp 1.34 07/09/13 20:51:49 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/vmError.hpp openjdk/hotspot/src/share/vm/utilities/vmError.hpp ---- openjdk6/hotspot/src/share/vm/utilities/vmError.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/vmError.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)vmError.hpp 1.18 07/07/19 19:18:33 JVM" --#endif - /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -104,4 +101,3 @@ - // signal was not changed by error reporter - static address get_resetted_sighandler(int sig); - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/workgroup.cpp openjdk/hotspot/src/share/vm/utilities/workgroup.cpp ---- openjdk6/hotspot/src/share/vm/utilities/workgroup.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/workgroup.cpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)workgroup.cpp 1.36 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/workgroup.hpp openjdk/hotspot/src/share/vm/utilities/workgroup.hpp ---- openjdk6/hotspot/src/share/vm/utilities/workgroup.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/workgroup.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)workgroup.hpp 1.22 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/xmlstream.cpp openjdk/hotspot/src/share/vm/utilities/xmlstream.cpp ---- openjdk6/hotspot/src/share/vm/utilities/xmlstream.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/xmlstream.cpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)xmlstream.cpp 1.17 07/05/05 17:07:12 JVM" --#endif - /* - * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/xmlstream.hpp openjdk/hotspot/src/share/vm/utilities/xmlstream.hpp ---- openjdk6/hotspot/src/share/vm/utilities/xmlstream.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/xmlstream.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)xmlstream.hpp 1.12 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp openjdk/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp ---- openjdk6/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)yieldingWorkgroup.cpp 1.11 07/05/05 17:07:11 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp openjdk/hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp ---- openjdk6/hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp 2008-11-25 10:12:14.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp 2008-12-05 16:41:22.317640321 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)yieldingWorkgroup.hpp 1.10 07/05/05 17:07:12 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/attachListener_linux.cpp openjdk/hotspot/src/os/linux/vm/attachListener_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/attachListener_linux.cpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/attachListener_linux.cpp 2008-12-05 16:41:21.637630063 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)attachListener_linux.cpp 1.14 07/05/05 17:04:34 JVM" --#endif - /* - * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/c1_globals_linux.hpp openjdk/hotspot/src/os/linux/vm/c1_globals_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/c1_globals_linux.hpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/c1_globals_linux.hpp 2008-12-05 16:41:21.637630063 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c1_globals_linux.hpp 1.12 07/05/05 17:04:35 JVM" --#endif - /* - * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/c2_globals_linux.hpp openjdk/hotspot/src/os/linux/vm/c2_globals_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/c2_globals_linux.hpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/c2_globals_linux.hpp 2008-12-05 16:41:21.637630063 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)c2_globals_linux.hpp 1.12 07/05/05 17:04:35 JVM" --#endif - /* - * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/chaitin_linux.cpp openjdk/hotspot/src/os/linux/vm/chaitin_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/chaitin_linux.cpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/chaitin_linux.cpp 2008-12-05 16:41:21.637630063 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)chaitin_linux.cpp 1.11 07/05/05 17:04:35 JVM" --#endif - /* - * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/globals_linux.hpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)globals_linux.hpp 1.12 07/05/05 17:04:35 JVM" --#endif - /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/hpi_linux.cpp openjdk/hotspot/src/os/linux/vm/hpi_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/hpi_linux.cpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/hpi_linux.cpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)hpi_linux.cpp 1.16 07/05/05 17:04:35 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/hpi_linux.hpp openjdk/hotspot/src/os/linux/vm/hpi_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/hpi_linux.hpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/hpi_linux.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)hpi_linux.hpp 1.18 07/05/05 17:04:34 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/interfaceSupport_linux.hpp openjdk/hotspot/src/os/linux/vm/interfaceSupport_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/interfaceSupport_linux.hpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/interfaceSupport_linux.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)interfaceSupport_linux.hpp 1.6 07/05/05 17:04:35 JVM" --#endif - /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -30,4 +27,3 @@ - static inline void serialize_memory(JavaThread *thread) { - os::write_memory_serialize_page(thread); - } -- -diff -ruNb openjdk6/hotspot/src/os/linux/vm/jsig.c openjdk/hotspot/src/os/linux/vm/jsig.c ---- openjdk6/hotspot/src/os/linux/vm/jsig.c 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/jsig.c 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jsig.c 1.12 07/05/05 17:04:34 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/jvm_linux.cpp openjdk/hotspot/src/os/linux/vm/jvm_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/jvm_linux.cpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/jvm_linux.cpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)jvm_linux.cpp 1.23 08/11/24 12:19:38 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -135,7 +132,7 @@ - */ - - struct siglabel { -- const char *name; -+ char *name; - int number; - }; - -diff -ruNb openjdk6/hotspot/src/os/linux/vm/jvm_linux.h openjdk/hotspot/src/os/linux/vm/jvm_linux.h ---- openjdk6/hotspot/src/os/linux/vm/jvm_linux.h 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/jvm_linux.h 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)jvm_linux.h 1.15 07/05/05 17:04:35 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/mutex_linux.cpp openjdk/hotspot/src/os/linux/vm/mutex_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/mutex_linux.cpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/mutex_linux.cpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)mutex_linux.cpp 1.49 07/06/29 03:58:25 JVM" --#endif - /* - * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -30,6 +27,3 @@ - - // put OS-includes here - # include -- -- -- -diff -ruNb openjdk6/hotspot/src/os/linux/vm/mutex_linux.inline.hpp openjdk/hotspot/src/os/linux/vm/mutex_linux.inline.hpp ---- openjdk6/hotspot/src/os/linux/vm/mutex_linux.inline.hpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/mutex_linux.inline.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)mutex_linux.inline.hpp 1.13 07/06/29 03:59:51 JVM" --#endif - /* - * Copyright 1999-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/objectMonitor_linux.cpp openjdk/hotspot/src/os/linux/vm/objectMonitor_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/objectMonitor_linux.cpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/objectMonitor_linux.cpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)objectMonitor_linux.cpp 1.69 07/05/05 17:04:36 JVM" --#endif - - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. -@@ -25,4 +22,3 @@ - * have any questions. - * - */ -- -diff -ruNb openjdk6/hotspot/src/os/linux/vm/objectMonitor_linux.hpp openjdk/hotspot/src/os/linux/vm/objectMonitor_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/objectMonitor_linux.hpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/objectMonitor_linux.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)objectMonitor_linux.hpp 1.18 07/05/05 17:04:36 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -26,4 +23,3 @@ - */ - - private: -- -diff -ruNb openjdk6/hotspot/src/os/linux/vm/objectMonitor_linux.inline.hpp openjdk/hotspot/src/os/linux/vm/objectMonitor_linux.inline.hpp ---- openjdk6/hotspot/src/os/linux/vm/objectMonitor_linux.inline.hpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/objectMonitor_linux.inline.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)objectMonitor_linux.inline.hpp 1.14 07/05/05 17:04:36 JVM" --#endif - /* - * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -24,4 +21,3 @@ - * have any questions. - * - */ -- -diff -ruNb openjdk6/hotspot/src/os/linux/vm/osThread_linux.cpp openjdk/hotspot/src/os/linux/vm/osThread_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/osThread_linux.cpp 2008-11-25 10:12:01.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/osThread_linux.cpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)osThread_linux.cpp 1.25 07/06/29 04:00:16 JVM" --#endif - /* - * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/osThread_linux.hpp openjdk/hotspot/src/os/linux/vm/osThread_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/osThread_linux.hpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/osThread_linux.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)osThread_linux.hpp 1.39 07/06/29 21:53:15 JVM" --#endif - /* - * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/os_linux.cpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)os_linux.cpp 1.259 08/11/24 12:20:22 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -78,8 +75,8 @@ - bool os::Linux::_is_floating_stack = false; - bool os::Linux::_is_NPTL = false; - bool os::Linux::_supports_fast_thread_cpu_time = false; --const char * os::Linux::_glibc_version = NULL; --const char * os::Linux::_libpthread_version = NULL; -+char * os::Linux::_glibc_version = NULL; -+char * os::Linux::_libpthread_version = NULL; - - static jlong initial_time_count=0; - -@@ -119,20 +116,6 @@ - return Linux::physical_memory(); - } - --julong os::allocatable_physical_memory(julong size) { --#ifdef _LP64 -- return size; --#else -- julong result = MIN2(size, (julong)3800*M); -- if (!is_allocatable(result)) { -- // See comments under solaris for alignment considerations -- julong reasonable_size = (julong)2*G - 2 * os::vm_page_size(); -- result = MIN2(size, reasonable_size); -- } -- return result; --#endif // _LP64 --} -- - //////////////////////////////////////////////////////////////////////////////// - // environment support - -@@ -216,7 +199,7 @@ - // the system call returns 1. This causes the VM to act as if it is - // a single processor and elide locking (see is_MP() call). - static bool unsafe_chroot_detected = false; --static const char *unstable_chroot_error = "/proc file system not found.\n" -+static char *unstable_chroot_error = "/proc file system not found.\n" - "Java may be unstable running multithreaded in a chroot " - "environment on Linux when /proc filesystem is not mounted."; - -@@ -550,18 +533,20 @@ - - // Vanilla RH-9 (glibc 2.3.2) has a bug that confstr() always tells - // us "NPTL-0.29" even we are running with LinuxThreads. Check if this -- // is the case. LinuxThreads has a hard limit on max number of threads. -- // So sysconf(_SC_THREAD_THREADS_MAX) will return a positive value. -- // On the other hand, NPTL does not have such a limit, sysconf() -- // will return -1 and errno is not changed. Check if it is really NPTL. -+ // is the case: - if (strcmp(os::Linux::glibc_version(), "glibc 2.3.2") == 0 && -- strstr(str, "NPTL") && -- sysconf(_SC_THREAD_THREADS_MAX) > 0) { -+ strstr(str, "NPTL")) { -+ // LinuxThreads has a hard limit on max number of threads. So -+ // sysconf(_SC_THREAD_THREADS_MAX) will return a positive value. -+ // On the other hand, NPTL does not have such a limit, sysconf() -+ // will return -1 and errno is not changed. Check if it is really -+ // NPTL: -+ if (sysconf(_SC_THREAD_THREADS_MAX) > 0) { - free(str); -- os::Linux::set_libpthread_version("linuxthreads"); -- } else { -- os::Linux::set_libpthread_version(str); -+ str = "linuxthreads"; -+ } - } -+ os::Linux::set_libpthread_version(str); - } else { - // glibc before 2.3.2 only has LinuxThreads. - os::Linux::set_libpthread_version("linuxthreads"); -@@ -4541,7 +4526,11 @@ - // Unlike system(), this function can be called from signal handler. It - // doesn't block SIGINT et al. - int os::fork_and_exec(char* cmd) { -- const char * argv[4] = {"sh", "-c", cmd, NULL}; -+ char * argv[4]; -+ argv[0] = "sh"; -+ argv[1] = "-c"; -+ argv[2] = cmd; -+ argv[3] = NULL; - - // fork() in LinuxThreads/NPTL is not async-safe. It needs to run - // pthread_atfork handlers and reset pthread library. All we need is a -@@ -4566,7 +4555,7 @@ - // IA64 should use normal execve() from glibc to match the glibc fork() - // above. - NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);) -- IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);) -+ IA64_ONLY(execve("/bin/sh", argv, environ);) - - // execve failed - _exit(-1); -diff -ruNb openjdk6/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/os_linux.hpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)os_linux.hpp 1.72 08/11/24 12:20:24 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -55,8 +52,8 @@ - static address _initial_thread_stack_bottom; - static uintptr_t _initial_thread_stack_size; - -- static const char *_glibc_version; -- static const char *_libpthread_version; -+ static char *_glibc_version; -+ static char *_libpthread_version; - - static bool _is_floating_stack; - static bool _is_NPTL; -@@ -73,8 +70,8 @@ - static julong physical_memory() { return _physical_memory; } - static void initialize_system_info(); - -- static void set_glibc_version(const char *s) { _glibc_version = s; } -- static void set_libpthread_version(const char *s) { _libpthread_version = s; } -+ static void set_glibc_version(char *s) { _glibc_version = s; } -+ static void set_libpthread_version(char *s) { _libpthread_version = s; } - - static bool supports_variable_stack_size(); - -@@ -134,8 +131,8 @@ - static bool chained_handler(int sig, siginfo_t* siginfo, void* context); - - // GNU libc and libpthread version strings -- static const char *glibc_version() { return _glibc_version; } -- static const char *libpthread_version() { return _libpthread_version; } -+ static char *glibc_version() { return _glibc_version; } -+ static char *libpthread_version() { return _libpthread_version; } - - // NPTL or LinuxThreads? - static bool is_LinuxThreads() { return !_is_NPTL; } -diff -ruNb openjdk6/hotspot/src/os/linux/vm/os_linux.inline.hpp openjdk/hotspot/src/os/linux/vm/os_linux.inline.hpp ---- openjdk6/hotspot/src/os/linux/vm/os_linux.inline.hpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.inline.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)os_linux.inline.hpp 1.31 07/06/29 04:01:54 JVM" --#endif - /* - * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/os_share_linux.hpp openjdk/hotspot/src/os/linux/vm/os_share_linux.hpp ---- openjdk6/hotspot/src/os/linux/vm/os_share_linux.hpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_share_linux.hpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)os_share_linux.hpp 1.11 07/05/05 17:04:36 JVM" --#endif - /* - * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/perfMemory_linux.cpp openjdk/hotspot/src/os/linux/vm/perfMemory_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/perfMemory_linux.cpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/perfMemory_linux.cpp 2008-12-05 16:41:21.647630214 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)perfMemory_linux.cpp 1.31 07/09/13 11:29:50 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1012,4 +1009,3 @@ - char* PerfMemory::backing_store_filename() { - return backing_store_file_name; - } -- -diff -ruNb openjdk6/hotspot/src/os/linux/vm/stubRoutines_linux.cpp openjdk/hotspot/src/os/linux/vm/stubRoutines_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/stubRoutines_linux.cpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/stubRoutines_linux.cpp 2008-12-05 16:41:21.657630365 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)stubRoutines_linux.cpp 1.10 07/05/05 17:04:36 JVM" --#endif - /* - * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/threadCritical_linux.cpp openjdk/hotspot/src/os/linux/vm/threadCritical_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/threadCritical_linux.cpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/threadCritical_linux.cpp 2008-12-05 16:41:21.657630365 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)threadCritical_linux.cpp 1.16 07/05/05 17:04:37 JVM" --#endif - /* - * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -67,4 +64,3 @@ - guarantee(ret == 0, "fatal error with pthread_mutex_unlock()"); - } - } -- -diff -ruNb openjdk6/hotspot/src/os/linux/vm/thread_linux.inline.hpp openjdk/hotspot/src/os/linux/vm/thread_linux.inline.hpp ---- openjdk6/hotspot/src/os/linux/vm/thread_linux.inline.hpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/thread_linux.inline.hpp 2008-12-05 16:41:21.657630365 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)thread_linux.inline.hpp 1.10 07/05/05 17:04:37 JVM" --#endif - /* - * Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/vmError_linux.cpp openjdk/hotspot/src/os/linux/vm/vmError_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/vmError_linux.cpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/vmError_linux.cpp 2008-12-05 16:41:21.657630365 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vmError_linux.cpp 1.15 08/11/24 12:20:39 JVM" --#endif - /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/os/linux/vm/vtune_linux.cpp openjdk/hotspot/src/os/linux/vm/vtune_linux.cpp ---- openjdk6/hotspot/src/os/linux/vm/vtune_linux.cpp 2008-11-25 10:12:02.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/vtune_linux.cpp 2008-12-05 16:41:21.657630365 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)vtune_linux.cpp 1.12 07/05/05 17:04:35 JVM" --#endif - /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. diff -r c5c31d555ae3 patches/icedtea-hotspot-citypeflow.patch --- a/patches/icedtea-hotspot-citypeflow.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp~ 2008-07-10 22:04:30.000000000 +0200 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp 2008-07-25 14:32:03.544802121 +0200 -@@ -130,7 +130,7 @@ - - // Used as a combined index for locals and temps - enum Cell { -- Cell_0 -+ Cell_0, Cell_max = UINT_MAX - }; - - // A StateVector summarizes the type information at some diff -r c5c31d555ae3 patches/icedtea-hotspot7-build-fixes.patch --- a/patches/icedtea-hotspot7-build-fixes.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ ---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp~ 2008-12-05 16:02:43.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-05 16:13:04.000000000 +0000 -@@ -86,16 +86,12 @@ - #define VMLP "" - #endif - --#ifdef KERNEL -- #define VMTYPE "Kernel" --#else // KERNEL - #ifdef TIERED - #define VMTYPE "Server" - #else - #define VMTYPE COMPILER1_PRESENT("Client") \ - COMPILER2_PRESENT("Server") - #endif // TIERED --#endif // KERNEL - - #ifndef HOTSPOT_VM_DISTRO - #error HOTSPOT_VM_DISTRO must be defined diff -r c5c31d555ae3 patches/icedtea-signed-types.patch --- a/patches/icedtea-signed-types.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -diff -r 9523b5ae0184 openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp ---- openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp Fri Nov 02 09:26:45 2007 +0000 -+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp Fri Nov 02 09:39:12 2007 +0000 -@@ -81,7 +81,7 @@ class CodeSection VALUE_OBJ_CLASS_SPEC { - address _locs_point; // last relocated position (grows upward) - bool _locs_own; // did I allocate the locs myself? - bool _frozen; // no more expansion of this section -- char _index; // my section number (SECT_INST, etc.) -+ signed char _index; // my section number (SECT_INST, etc.) - CodeBuffer* _outer; // enclosing CodeBuffer - - // (Note: _locs_point used to be called _last_reloc_offset.) -diff -r 9523b5ae0184 openjdk/hotspot/src/share/vm/utilities/ostream.cpp ---- openjdk/hotspot/src/share/vm/utilities/ostream.cpp Fri Nov 02 09:26:45 2007 +0000 -+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp Fri Nov 02 09:37:53 2007 +0000 -@@ -829,7 +829,7 @@ bool networkStream::connect(const char * - server.sin_port = htons(port); - - server.sin_addr.s_addr = inet_addr(ip); -- if (server.sin_addr.s_addr == (unsigned long)-1) { -+ if (server.sin_addr.s_addr == (in_addr_t)-1) { - #ifdef _WINDOWS - struct hostent* host = hpi::get_host_by_name((char*)ip); - #else -diff -r ca98ea212429 openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp ---- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp Fri Aug 08 16:06:52 2008 +0100 -+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp Fri Aug 08 16:15:45 2008 +0100 -@@ -388,7 +388,7 @@ const ciTypeFlow::StateVector* ciTypeFlo - // Set the rest of the locals to bottom. - Cell cell = state->next_cell(state->tos()); - state->set_stack_size(0); -- int limit = state->limit_cell(); -+ Cell limit = state->limit_cell(); - for (; cell < limit; cell = state->next_cell(cell)) { - state->set_type_at(cell, state->bottom_type()); - } From gnu_andrew at member.fsf.org Thu May 7 08:31:51 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 7 May 2009 16:31:51 +0100 Subject: [PATCH] Remove support for building Zero with bundled HotSpot In-Reply-To: <20090507124147.GB3181@redhat.com> References: <20090507124147.GB3181@redhat.com> Message-ID: <17c6771e0905070831q7fe31c53ob634fb9e5d7e3862@mail.gmail.com> 2009/5/7 Gary Benson : > Hi all, > > Once upon a time, IcedTea used the HotSpot supplied in the > OpenJDK 6 tarball. ?This didn't contain the C++ interpreter, > so for Zero and Shark a patch was created to upgrade the > HotSpot to a (somewhat arbitrary) newer version that did. > > Nowadays, IcedTea uses an upgraded HotSpot by default, one that > contains the C++ interpreter. ?This patch removes support for > building Zero and Shark with the original HotSpot, an option > that has not worked for some months. > > Ok to commit? > > Cheers, > Gary > > -- > http://gbenson.net/ > Looks ok to me, but it'd be nice to have a ChangeLog in the mail, so we can see more easily which patches are being removed :) I'd be tempted to go the whole hog and just drop the remaining original patches, but up to you... :) -- 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 May 7 08:47:09 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 May 2009 15:47:09 +0000 Subject: [Bug 332] New: An unexpected error has been detected by Java Runtime Environment: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=332 Summary: An unexpected error has been detected by Java Runtime Environment: Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: esunny at gmail.com Eclipse crashes immediately when started from commandline. When started from KDE (Shortcut) crashes sometimes at Ctrl+S. I do have a log file, can it be uploaded??? -- 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 Fri May 8 01:27:31 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 09:27:31 +0100 Subject: [PATCH] Remove support for building Zero with bundled HotSpot In-Reply-To: <17c6771e0905070831q7fe31c53ob634fb9e5d7e3862@mail.gmail.com> References: <20090507124147.GB3181@redhat.com> <17c6771e0905070831q7fe31c53ob634fb9e5d7e3862@mail.gmail.com> Message-ID: <20090508082730.GA3190@redhat.com> Andrew John Hughes wrote: > 2009/5/7 Gary Benson : > > Once upon a time, IcedTea used the HotSpot supplied in the > > OpenJDK 6 tarball. ?This didn't contain the C++ interpreter, > > so for Zero and Shark a patch was created to upgrade the > > HotSpot to a (somewhat arbitrary) newer version that did. > > > > Nowadays, IcedTea uses an upgraded HotSpot by default, one that > > contains the C++ interpreter. ?This patch removes support for > > building Zero and Shark with the original HotSpot, an option > > that has not worked for some months. > > > > Ok to commit? > > Looks ok to me, but it'd be nice to have a ChangeLog in the mail, > so we can see more easily which patches are being removed :) Ah, attached. > I'd be tempted to go the whole hog and just drop the remaining > original patches, but up to you... :) It's tempting... is anyone using them? Cheers, Gary -- http://gbenson.net/ From gbenson at redhat.com Fri May 8 01:41:34 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 09:41:34 +0100 Subject: [PATCH] Remove support for building Zero with bundled HotSpot In-Reply-To: <20090508082730.GA3190@redhat.com> References: <20090507124147.GB3181@redhat.com> <17c6771e0905070831q7fe31c53ob634fb9e5d7e3862@mail.gmail.com> <20090508082730.GA3190@redhat.com> Message-ID: <20090508084134.GB3190@redhat.com> Gary Benson wrote: > Andrew John Hughes wrote: > > Looks ok to me, but it'd be nice to have a ChangeLog in the mail, > > so we can see more easily which patches are being removed :) > > Ah, attached. Really attached... -------------- next part -------------- diff -r c5c31d555ae3 ChangeLog --- a/ChangeLog Wed May 06 16:10:04 2009 -0400 +++ b/ChangeLog Fri May 08 09:25:40 2009 +0100 @@ -1,3 +1,17 @@ +2009-05-08 Gary Benson + + * Makefile.am: Removed patches and logic for building Zero and + Shark with original HotSpot. + + * patches/icedtea-bytecodeInterpreterWithChecks.patch: Removed. + * patches/icedtea-hotspot-6b14-7b24.patch: Likewise. + * patches/icedtea-hotspot-citypeflow.patch: Likewise. + * patches/icedtea-hotspot7-build-fixes.patch: Likewise. + * patches/icedtea-signed-types.patch: Likewise. + * patches/hotspot/original/icedtea-core-zero-build.patch: Likewise. + + * HACKING: Updated. + 2009-05-05 Deepak Bhole * Makefile.am: Remove GCJ Web Plugin support. From aph at redhat.com Fri May 8 03:00:31 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 11:00:31 +0100 Subject: [OpenJDK 2D-Dev] Trying to understand changeset 1010:467e4f25965c for lcms In-Reply-To: <4A035336.20706@sun.com> References: <4A02FB00.3090706@redhat.com> <4A031F25.9060602@sun.com> <4A0325CF.2060701@redhat.com> <4A032813.5040507@sun.com> <4A033293.8000805@redhat.com> <4A035336.20706@sun.com> Message-ID: <4A0402BF.6010507@redhat.com> Phil Race wrote: > Andrew Haley wrote: >> Phil Race wrote: >> >> The bug is at https://bugs.openjdk.java.net/show_bug.cgi?id=100050, with >> a suggested patch attached to it. Please have a look and let me know if >> I can push the patch to 6-open and jdk7. If you need webrevs as well as >> the patch I can provide them. > > I see it, although I was thrown at first. since it looks like > a patch to go from your fixed version back to the current state. > [Ah .. I think I just see that you uploaded a corrected version]. > I'll give it a whirl in a bit. OK. The patch is a very cautious approach to fixing the bug: it might be that we simply should move the call of grow() to after we have read the previous contents of the profile. But there must have been some reason why that call was moved, and I'd like to know in order to avoid breaking something else. > Jennifer is coordinating getting webrevs archived and getting > reviews properly documented. She'll pick this up and you can > coordinate how to push with her. Righto. In the meantime OpenJDK is broken, so I'll have to make this an IcedTea local patch in order to fix Java compatibility. Andrew. From gbenson at redhat.com Fri May 8 03:23:47 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 08 May 2009 10:23:47 +0000 Subject: changeset in /hg/icedtea6: 2009-05-08 Gary Benson changeset 934d7b595b32 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=934d7b595b32 description: 2009-05-08 Gary Benson * Makefile.am: Removed patches and logic for building Zero and Shark with original HotSpot. * patches/icedtea-bytecodeInterpreterWithChecks.patch: Removed. * patches/icedtea-hotspot-6b14-7b24.patch: Likewise. * patches/icedtea-hotspot-citypeflow.patch: Likewise. * patches/icedtea-hotspot7-build-fixes.patch: Likewise. * patches/icedtea-signed-types.patch: Likewise. * patches/hotspot/original/icedtea-core-zero-build.patch: Likewise. * HACKING: Updated. diffstat: 9 files changed, 35 insertions(+), 14204 deletions(-) ChangeLog | 14 HACKING | 15 Makefile.am | 56 patches/hotspot/original/icedtea-core-zero-build.patch | 104 patches/icedtea-bytecodeInterpreterWithChecks.patch | 18 patches/icedtea-hotspot-6b14-7b24.patch |13966 ---------------- patches/icedtea-hotspot-citypeflow.patch | 11 patches/icedtea-hotspot7-build-fixes.patch | 19 patches/icedtea-signed-types.patch | 36 diffs (truncated from 14332 to 500 lines): diff -r c5c31d555ae3 -r 934d7b595b32 ChangeLog --- a/ChangeLog Wed May 06 16:10:04 2009 -0400 +++ b/ChangeLog Fri May 08 11:24:32 2009 +0100 @@ -1,3 +1,17 @@ 2009-05-05 Deepak Bhole + + * Makefile.am: Removed patches and logic for building Zero and + Shark with original HotSpot. + + * patches/icedtea-bytecodeInterpreterWithChecks.patch: Removed. + * patches/icedtea-hotspot-6b14-7b24.patch: Likewise. + * patches/icedtea-hotspot-citypeflow.patch: Likewise. + * patches/icedtea-hotspot7-build-fixes.patch: Likewise. + * patches/icedtea-signed-types.patch: Likewise. + * patches/hotspot/original/icedtea-core-zero-build.patch: Likewise. + + * HACKING: Updated. + 2009-05-05 Deepak Bhole * Makefile.am: Remove GCJ Web Plugin support. diff -r c5c31d555ae3 -r 934d7b595b32 HACKING --- a/HACKING Wed May 06 16:10:04 2009 -0400 +++ b/HACKING Fri May 08 11:24:32 2009 +0100 @@ -125,18 +125,9 @@ The following patches are only applied f The following patches are only applied for IcedTea builds using the zero-assembler: * icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. -* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485). * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. -* icedtea-hotspot-6b12-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only). - - Never edit this patch. It should be regenerated by unzipping the - openjdk6 build you're using into openjdk6, and the openjdk7 build - you want to use into openjdk, then running: - diff -ruNb openjdk{6,}/hotspot/src/share > icedtea-hotspot-6bXX-7bYY.patch - diff -ruNb openjdk{6,}/hotspot/src/os/linux >> icedtea-hotspot-6bXX-7bYY.patch -* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef. * icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. * icedtea-signature-iterator.patch: Add zero-specific signature handling. -* icedtea-signed-types.patch: Make use of unsigned/signed types explicit. * 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. @@ -175,3 +166,9 @@ changes to the OpenJDK code base and/or * icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13. * openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28. * icedtea-cc-interp-no-fer.patch: Replaced with icedtea-cc-interp-jvmti.patch, of which it is a subset. +* icedtea-hotspot-6b14-7b24.patch: Upgrade HotSpot to a version with the C++ interpreter; not required with HS14. +* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef; not required with HS14. +* icedtea-signed-types.patch: Make use of unsigned/signed types explicit; not required with HS14. +* icedtea-hotspot-citypeflow.patch: Not required with HS14. +* icedtea-core-zero-build.patch: Not required with HS14. +* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14. diff -r c5c31d555ae3 -r 934d7b595b32 Makefile.am --- a/Makefile.am Wed May 06 16:10:04 2009 -0400 +++ b/Makefile.am Fri May 08 11:24:32 2009 +0100 @@ -459,16 +459,8 @@ else patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch endif -# If ZERO_BUILD is set then we are building zero and need -# to patch up to OpenJDK 7 HotSpot for the C++ interpreter. -if WITH_ALT_HSBUILD -ZERO_PATCHES = -else +# Zero patches ZERO_PATCHES = \ - patches/icedtea-hotspot-6b14-7b24.patch \ - patches/icedtea-hotspot7-build-fixes.patch -endif -ZERO_PATCHES += \ patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ patches/icedtea-signature-iterator.patch \ patches/icedtea-test-atomic-operations.patch \ @@ -476,27 +468,23 @@ ZERO_PATCHES += \ patches/icedtea-ia64-bugfix.patch \ patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch -if !WITH_ALT_HSBUILD -ZERO_PATCHES += \ - patches/icedtea-signed-types.patch \ - patches/icedtea-hotspot-citypeflow.patch -endif - -# Patches needed when not using the newer OpenJDK 7 HotSpot for zero. -NON_ZERO_PATCHES = \ +if ZERO_BUILD + ZERO_PATCHES_COND = $(ZERO_PATCHES) +else + ZERO_PATCHES_COND = +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 ZERO_BUILD - ZERO_PATCHES_COND = $(ZERO_PATCHES) -else if WITH_ALT_HSBUILD - ZERO_PATCHES_COND = -else - ZERO_PATCHES_COND = $(NON_ZERO_PATCHES) -endif + OLD_HOTSPOT_PATCHES_COND = +else + OLD_HOTSPOT_PATCHES_COND = $(OLD_HOTSPOT_PATCHES) endif # If Shark is required, apply shark patch @@ -510,6 +498,7 @@ ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ $(ZERO_PATCHES_COND) \ + $(OLD_HOTSPOT_PATCHES_COND) \ patches/icedtea-version.patch \ patches/hotspot/$(HSBUILD)/icedtea-version.patch \ patches/icedtea-copy-plugs.patch \ @@ -539,22 +528,8 @@ ICEDTEA_PATCHES = \ patches/icedtea-javafiles.patch \ patches/icedtea-core-build.patch \ patches/icedtea-jvmtiEnv.patch \ - patches/icedtea-lcms.patch - -if WITH_ALT_HSBUILD -ICEDTEA_PATCHES += \ - patches/hotspot/$(HSBUILD)/icedtea-core-build.patch -else -if ZERO_BUILD -ICEDTEA_PATCHES += \ - patches/hotspot/$(HSBUILD)/icedtea-core-zero-build.patch -else -ICEDTEA_PATCHES += \ - patches/hotspot/$(HSBUILD)/icedtea-core-build.patch -endif -endif - -ICEDTEA_PATCHES += \ + patches/icedtea-lcms.patch \ + patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \ patches/icedtea-linker-options.patch \ patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \ patches/icedtea-timerqueue.patch \ @@ -615,7 +590,6 @@ endif if !WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ - patches/icedtea-bytecodeInterpreterWithChecks.patch \ patches/icedtea-sparc.patch endif diff -r c5c31d555ae3 -r 934d7b595b32 patches/hotspot/original/icedtea-core-zero-build.patch --- a/patches/hotspot/original/icedtea-core-zero-build.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ ---- openjdk/hotspot/make/Makefile.orig 2008-11-25 09:11:57.000000000 +0000 -+++ openjdk/hotspot/make/Makefile 2008-12-05 16:54:54.000000000 +0000 -@@ -91,6 +91,15 @@ - all_debug: jvmg jvmg1 jvmgkernel docs export_debug - all_optimized: optimized optimized1 optimizedkernel docs export_optimized - -+# Core (non-compiler) targets made available with this Makefile -+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore -+ -+allcore: all_productcore all_fastdebugcore -+all_productcore: productcore docs export_product -+all_fastdebugcore: fastdebugcore docs export_fastdebug -+all_debugcore: jvmgcore docs export_debug -+all_optimizedcore: optimizedcore docs export_optimized -+ - # Do everything - world: all create_jdk - -@@ -113,6 +122,10 @@ - $(CD) $(GAMMADIR)/make; \ - $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT) - -+$(CORE_VM_TARGETS): -+ $(CD) $(GAMMADIR)/make; \ -+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT) -+ - $(KERNEL_VM_TARGETS): - $(CD) $(GAMMADIR)/make; \ - $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT) -@@ -159,6 +172,12 @@ - $(MAKE_ARGS) $(VM_TARGET) - endif - -+generic_buildcore: -+ $(MKDIR) -p $(OUTPUTDIR) -+ $(CD) $(OUTPUTDIR); \ -+ $(MAKE) -f $(ABS_OS_MAKEFILE) \ -+ $(MAKE_ARGS) $(VM_TARGET) -+ - generic_buildkernel: - $(MKDIR) -p $(OUTPUTDIR) - ifeq ($(OSNAME),windows) -@@ -205,13 +224,21 @@ - XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt - DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs - C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 -+ifdef ICEDTEA_CORE_BUILD -+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core -+else - C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 -+endif - KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel - C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR) - C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) - KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR) - - # Misc files and generated files need to come from C1 or C2 area -+ifdef ICEDTEA_CORE_BUILD -+ MISC_DIR=$(C2_DIR) -+ GEN_DIR=$(C2_BASE_DIR)/generated -+else - ifeq ($(ARCH_DATA_MODEL), 32) - MISC_DIR=$(C1_DIR) - GEN_DIR=$(C1_BASE_DIR)/generated -@@ -219,6 +246,7 @@ - MISC_DIR=$(C2_DIR) - GEN_DIR=$(C2_BASE_DIR)/generated - endif -+endif - - # Bin files (windows) - ifeq ($(OSNAME),windows) ---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-12-05 16:54:13.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-05 16:54:54.000000000 +0000 -@@ -89,8 +89,12 @@ - #ifdef TIERED - #define VMTYPE "Server" - #else -- #define VMTYPE COMPILER1_PRESENT("Client") \ -- COMPILER2_PRESENT("Server") -+#if defined(COMPILER1) || defined(COMPILER2) -+ #define VMTYPE COMPILER1_PRESENT("Client") \ -+ COMPILER2_PRESENT("Server") -+#else -+ #define VMTYPE "Core" -+#endif // COMPILER1 || COMPILER2 - #endif // TIERED - - #ifndef HOTSPOT_VM_DISTRO ---- openjdk/hotspot/build/linux/makefiles/defs.make.orig 2008-11-25 09:11:51.000000000 +0000 -+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-12-05 16:54:54.000000000 +0000 -@@ -97,6 +97,7 @@ - EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so -+ifndef ICEDTEA_CORE_BUILD - ifeq ($(ARCH_DATA_MODEL), 32) - EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt -@@ -111,3 +112,4 @@ - EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar - endif - endif -+endif diff -r c5c31d555ae3 -r 934d7b595b32 patches/icedtea-bytecodeInterpreterWithChecks.patch --- a/patches/icedtea-bytecodeInterpreterWithChecks.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ ---- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2007-10-12 03:46:08.000000000 -0400 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2007-10-29 11:57:33.000000000 -0400 -@@ -6,6 +6,7 @@ - - - -+ - - - #define VM_JVMTI -@@ -15,7 +16,6 @@ - - - -- - - - diff -r c5c31d555ae3 -r 934d7b595b32 patches/icedtea-hotspot-6b14-7b24.patch --- a/patches/icedtea-hotspot-6b14-7b24.patch Wed May 06 16:10:04 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13966 +0,0 @@ -diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/BuildConfig.java openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java ---- openjdk6/hotspot/src/share/tools/MakeDeps/BuildConfig.java 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java 2008-12-05 16:41:21.727631421 +0100 -@@ -704,6 +704,3 @@ - receiver.add(attr); receiver.add(value); - } - } -- -- -- -diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/Macro.java openjdk/hotspot/src/share/tools/MakeDeps/Macro.java ---- openjdk6/hotspot/src/share/tools/MakeDeps/Macro.java 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/tools/MakeDeps/Macro.java 2008-12-05 16:41:21.727631421 +0100 -@@ -26,4 +26,3 @@ - public String name; - public String contents; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlc.hpp openjdk/hotspot/src/share/vm/adlc/adlc.hpp ---- openjdk6/hotspot/src/share/vm/adlc/adlc.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2008-12-05 16:41:21.737631572 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)adlc.hpp 1.28 07/05/05 17:04:59 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlparse.cpp openjdk/hotspot/src/share/vm/adlc/adlparse.cpp ---- openjdk6/hotspot/src/share/vm/adlc/adlparse.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/adlparse.cpp 2008-12-05 16:41:21.737631572 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)adlparse.cpp 1.205 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlparse.hpp openjdk/hotspot/src/share/vm/adlc/adlparse.hpp ---- openjdk6/hotspot/src/share/vm/adlc/adlparse.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/adlparse.hpp 2008-12-05 16:41:21.737631572 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)adlparse.hpp 1.79 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -273,5 +270,3 @@ - static bool is_int_token(const char* token, int& intval); - static void trim(char* &token); // trim leading & trailing spaces - }; -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/archDesc.cpp openjdk/hotspot/src/share/vm/adlc/archDesc.cpp ---- openjdk6/hotspot/src/share/vm/adlc/archDesc.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/archDesc.cpp 2008-12-05 16:41:21.737631572 +0100 -@@ -22,6 +22,7 @@ - // - // - -+ - // archDesc.cpp - Internal format for architecture definition - #include "adlc.hpp" - -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/arena.cpp openjdk/hotspot/src/share/vm/adlc/arena.cpp ---- openjdk6/hotspot/src/share/vm/adlc/arena.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/arena.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)arena.cpp 1.16 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -173,4 +170,3 @@ - void CHeapObj::operator delete(void* p){ - free(p); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/arena.hpp openjdk/hotspot/src/share/vm/adlc/arena.hpp ---- openjdk6/hotspot/src/share/vm/adlc/arena.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/arena.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)arena.hpp 1.17 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -158,4 +155,3 @@ - size_t size_in_bytes() const { return _size_in_bytes; } - void set_size_in_bytes(size_t size) { _size_in_bytes = size; } - }; -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dfa.cpp openjdk/hotspot/src/share/vm/adlc/dfa.cpp ---- openjdk6/hotspot/src/share/vm/adlc/dfa.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/dfa.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dfa.cpp 1.83 07/05/05 17:04:59 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -1022,4 +1019,3 @@ - void ProductionState::print() { - _production.print(print_key, print_production); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dict2.cpp openjdk/hotspot/src/share/vm/adlc/dict2.cpp ---- openjdk6/hotspot/src/share/vm/adlc/dict2.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/dict2.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)dict2.cpp 1.19 07/05/05 17:04:59 JVM" --#endif - /* - * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -354,5 +351,3 @@ - } - _key = _value = NULL; - } -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dict2.hpp openjdk/hotspot/src/share/vm/adlc/dict2.hpp ---- openjdk6/hotspot/src/share/vm/adlc/dict2.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/dict2.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)dict2.hpp 1.16 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1998-2000 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -121,5 +118,3 @@ - }; - - #endif // _DICT_ -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/filebuff.cpp openjdk/hotspot/src/share/vm/adlc/filebuff.cpp ---- openjdk6/hotspot/src/share/vm/adlc/filebuff.cpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)filebuff.cpp 1.30 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -297,4 +294,3 @@ - va_end(args); - _AD._no_output = 1; - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/filebuff.hpp openjdk/hotspot/src/share/vm/adlc/filebuff.hpp ---- openjdk6/hotspot/src/share/vm/adlc/filebuff.hpp 2008-11-25 10:12:03.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)filebuff.hpp 1.27 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/forms.cpp openjdk/hotspot/src/share/vm/adlc/forms.cpp ---- openjdk6/hotspot/src/share/vm/adlc/forms.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/forms.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)forms.cpp 1.161 07/05/05 17:04:59 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -386,4 +383,3 @@ - void SourceForm::output(FILE *fp) { - fprintf(fp,"\n//%s\n%s\n",classname(),(_code?_code:"")); - } -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/forms.hpp openjdk/hotspot/src/share/vm/adlc/forms.hpp ---- openjdk6/hotspot/src/share/vm/adlc/forms.hpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/forms.hpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_HDR --#pragma ident "@(#)forms.hpp 1.150 07/05/05 17:05:00 JVM" --#endif - /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -587,6 +584,3 @@ - void print_asserts(FILE *fp); - void dump(); - }; -- -- -- -diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formsopt.cpp openjdk/hotspot/src/share/vm/adlc/formsopt.cpp ---- openjdk6/hotspot/src/share/vm/adlc/formsopt.cpp 2008-11-25 10:12:04.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2008-12-05 16:41:21.747631722 +0100 -@@ -1,6 +1,3 @@ --#ifdef USE_PRAGMA_IDENT_SRC --#pragma ident "@(#)formsopt.cpp 1.53 07/05/05 17:05:01 JVM" --#endif - /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -725,4 +722,3 @@ - void PeepReplace::output(FILE *fp) { // Write info to output files - fprintf(fp,"PeepReplace:\n"); From aph at redhat.com Fri May 8 04:37:07 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 12:37:07 +0100 Subject: Bug 100050 - lcms 1.18 update breaks ICC_ProfileRGB Tests Message-ID: <4A041963.2030203@redhat.com> Colour management is broken at the moment because the import of the latest OpenJDK 6 contains a new version of lcms that is buggy. I've written a patch to fix this, and Sun are looking at it. In the meantime I propose to patch IcedTea as a temporary workaround. OK? Andrew. --- LCMS.c~ 2009-04-24 08:34:31.000000000 +0100 +++ LCMS.c 2009-05-07 19:11:37.000000000 +0100 @@ -610,14 +610,19 @@ return FALSE; } - if (!Icc->Grow(Icc, delta)) { - free(ptr); - if(isNew) { - Icc->TagCount--; - } - J2dRlsTraceLn(J2D_TRACE_ERROR, - "_cmsModifyTagData: Icc->Grow() == FALSE"); - return FALSE; + /* We change the size of Icc here only if we know it'll actually + * grow: if Icc is about to shrink we must wait until we've read + * the previous data. */ + if (delta > 0) { + if (!Icc->Grow(Icc, delta)) { + free(ptr); + if(isNew) { + Icc->TagCount--; + } + J2dRlsTraceLn(J2D_TRACE_ERROR, + "_cmsModifyTagData: Icc->Grow() == FALSE"); + return FALSE; + } } /* Compute size of tag data before/after the modified tag */ @@ -680,6 +685,18 @@ temp = TransportValue32(profileSize); Icc->Write(Icc, sizeof(icUInt32Number), &temp); + /* Shrink Icc, if needed. */ + if (delta < 0) { + if (!Icc->Grow(Icc, delta)) { + free(ptr); + if(isNew) { + Icc->TagCount--; + } + J2dRlsTraceLn(J2D_TRACE_ERROR, + "_cmsModifyTagData: Icc->Grow() == FALSE"); + return FALSE; + } + } /* Adjust tag offsets: if the tag is new, we must account for the new tag table entry; otherwise, only those tags after From gnu_andrew at member.fsf.org Fri May 8 04:43:15 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 12:43:15 +0100 Subject: [PATCH] Remove support for building Zero with bundled HotSpot In-Reply-To: <20090508082730.GA3190@redhat.com> References: <20090507124147.GB3181@redhat.com> <17c6771e0905070831q7fe31c53ob634fb9e5d7e3862@mail.gmail.com> <20090508082730.GA3190@redhat.com> Message-ID: <17c6771e0905080443k759042e3x184ae832ee67810d@mail.gmail.com> 2009/5/8 Gary Benson : > Andrew John Hughes wrote: >> 2009/5/7 Gary Benson : >> > Once upon a time, IcedTea used the HotSpot supplied in the >> > OpenJDK 6 tarball. ?This didn't contain the C++ interpreter, >> > so for Zero and Shark a patch was created to upgrade the >> > HotSpot to a (somewhat arbitrary) newer version that did. >> > >> > Nowadays, IcedTea uses an upgraded HotSpot by default, one that >> > contains the C++ interpreter. ?This patch removes support for >> > building Zero and Shark with the original HotSpot, an option >> > that has not worked for some months. >> > >> > Ok to commit? >> >> Looks ok to me, but it'd be nice to have a ChangeLog in the mail, >> so we can see more easily which patches are being removed :) > > Ah, attached. > Cheers. Looks right to me, based on what we did for 7 and hs14. >> I'd be tempted to go the whole hog and just drop the remaining >> original patches, but up to you... :) > > It's tempting... is anyone using them? > > Cheers, > Gary > > -- > http://gbenson.net/ > I've only ever heard of doko using them, that's if they still work. -- 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 Fri May 8 04:45:47 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 12:45:47 +0100 Subject: Bug 100050 - lcms 1.18 update breaks ICC_ProfileRGB Tests In-Reply-To: <4A041963.2030203@redhat.com> References: <4A041963.2030203@redhat.com> Message-ID: <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> 2009/5/8 Andrew Haley : > Colour management is broken at the moment because the import of the > latest OpenJDK 6 contains a new version of lcms that is buggy. > > I've written a patch to fix this, and Sun are looking at it. ?In the > meantime I propose to patch IcedTea as a temporary workaround. > > OK? > > Andrew. > > > > --- LCMS.c~ ? ? 2009-04-24 08:34:31.000000000 +0100 > +++ LCMS.c ? ? ?2009-05-07 19:11:37.000000000 +0100 > @@ -610,14 +610,19 @@ > ? ? ? ? return FALSE; > ? ? } > > - ? ?if (!Icc->Grow(Icc, delta)) { > - ? ? ? ?free(ptr); > - ? ? ? ?if(isNew) { > - ? ? ? ? ? ?Icc->TagCount--; > - ? ? ? ?} > - ? ? ? ?J2dRlsTraceLn(J2D_TRACE_ERROR, > - ? ? ? ? ? ? ? ? ? ? ?"_cmsModifyTagData: Icc->Grow() == FALSE"); > - ? ? ? ?return FALSE; > + ? ?/* We change the size of Icc here only if we know it'll actually > + ? ? * grow: if Icc is about to shrink we must wait until we've read > + ? ? * the previous data. ?*/ > + ? ?if (delta > 0) { > + ? ? ? if (!Icc->Grow(Icc, delta)) { > + ? ? ? ? ? free(ptr); > + ? ? ? ? ? if(isNew) { > + ? ? ? ? ? ? ? Icc->TagCount--; > + ? ? ? ? ? } > + ? ? ? ? ? J2dRlsTraceLn(J2D_TRACE_ERROR, > + ? ? ? ? ? ? ? ? ? ? ? ? "_cmsModifyTagData: Icc->Grow() == FALSE"); > + ? ? ? ? ? return FALSE; > + ? ? ? } > ? ? } > > ? ? /* Compute size of tag data before/after the modified tag */ > @@ -680,6 +685,18 @@ > ? ? temp = TransportValue32(profileSize); > ? ? Icc->Write(Icc, sizeof(icUInt32Number), &temp); > > + ? ?/* Shrink Icc, if needed. ?*/ > + ? ?if (delta < 0) { > + ? ? ? if (!Icc->Grow(Icc, delta)) { > + ? ? ? ? ? free(ptr); > + ? ? ? ? ? if(isNew) { > + ? ? ? ? ? ? ? Icc->TagCount--; > + ? ? ? ? ? } > + ? ? ? ? ? J2dRlsTraceLn(J2D_TRACE_ERROR, > + ? ? ? ? ? ? ? ? ? ? ? ? "_cmsModifyTagData: Icc->Grow() == FALSE"); > + ? ? ? ? ? return FALSE; > + ? ? ? } > + ? ?} > > ? ? /* Adjust tag offsets: if the tag is new, we must account > ? ? ? ?for the new tag table entry; otherwise, only those tags after > Sounds sensible to me. Can you make sure to add it to the HACKING file/wiki page with any tracking data like bug IDs so we know that this is already on its way upstream? 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 gnu_andrew at member.fsf.org Fri May 8 04:54:51 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 12:54:51 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release Message-ID: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> Dear all, Sun plan to release a JavaOne preview of JDK7 on May 21st (http://openjdk.java.net/projects/jdk7/milestones/). We'd like to do a corresponding release of IcedTea7 (1.10) around the same time, that can then be packaged in any distros that wish to ship such a preview. This will involve: * Updating IcedTea7 to support the latest build drop from Sun (currently b57, which is the last non-stabilisation release). IcedTea7 is now based on the IcedTea forest (http://hg.openjdk.java.net/icedtea/jdk7) so this is a two stage process involving pulling the latest changes into the forest and then ensuring this builds with IcedTea7. * Updating Shark/Zero in IcedTea7; ideally we would put this directly into the forest, but I don't know how ready Gary is for this step. * Updating the plugin/jaxws support; again it would be nice to have it in the forest, but there probably isn't enough time. * Any additional features from IcedTea6; we're not doing mass merges any more because the two have diverged so far from each other that this has become impractical (probably lots of conflicts and build breakages for a few usable changes). doko and mjw have already requested that --with-additional-vms and systemtap support be added. Any help would be much appreciated. Integration of Shark/Zero and the plugin can be done fairly independently so if someone wants to work on this, feel free. -- 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 aph at redhat.com Fri May 8 05:04:14 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 13:04:14 +0100 Subject: Bug 100050 - lcms 1.18 update breaks ICC_ProfileRGB Tests In-Reply-To: <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> References: <4A041963.2030203@redhat.com> <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> Message-ID: <4A041FBE.6020209@redhat.com> Andrew John Hughes wrote: > Sounds sensible to me. Can you make sure to add it to the HACKING > file/wiki page with any tracking data like bug IDs so we know that > this is already on its way upstream? Sure. Having to update HACKING and the wiki is rather painful; I wonder if I could just move everything to the wiki. Andrew. From gnu_andrew at member.fsf.org Fri May 8 05:06:20 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 13:06:20 +0100 Subject: Bug 100050 - lcms 1.18 update breaks ICC_ProfileRGB Tests In-Reply-To: <4A041FBE.6020209@redhat.com> References: <4A041963.2030203@redhat.com> <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> <4A041FBE.6020209@redhat.com> Message-ID: <17c6771e0905080506j24139512u85c3a9277e9f9bef@mail.gmail.com> 2009/5/8 Andrew Haley : > Andrew John Hughes wrote: > >> Sounds sensible to me. ?Can you make sure to add it to the HACKING >> file/wiki page with any tracking data like bug IDs so we know that >> this is already on its way upstream? > > Sure. ?Having to update HACKING and the wiki is rather painful; I > wonder if I could just move everything to the wiki. > Fine by me, especially if you're volunteering to do it ;) It would be preferable to just have one source of such information. I only mentioned both because we have a mix of information between the two at present. > Andrew. > > -- 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 thebohemian at gmx.net Fri May 8 05:23:15 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Fri, 08 May 2009 14:23:15 +0200 Subject: FYI: use --cxxflags Message-ID: <4A042433.8080005@gmx.net> HI, the attached patch makes shark compile using the --cxxflags llvm-config provides. This makes us not miss some important flags. 2009-05-08 Robert Schuster * configure.ac: Use --cxxflags instead of --cflags for llvm-config. Regards Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: llvm-cxxflags.patch Type: text/x-patch Size: 634 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090508/4be963be/llvm-cxxflags.patch -------------- 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/20090508/4be963be/signature.asc From langel at redhat.com Fri May 8 05:39:16 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 08 May 2009 08:39:16 -0400 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> Message-ID: <4A0427F4.8050204@redhat.com> Andrew John Hughes wrote: > Dear all, > > Sun plan to release a JavaOne preview of JDK7 on May 21st > (http://openjdk.java.net/projects/jdk7/milestones/). > We'd like to do a corresponding release of IcedTea7 (1.10) around the > same time, that can then be packaged in any distros that wish to ship > such a preview. > This will involve: > > * Updating IcedTea7 to support the latest build drop from Sun > (currently b57, which is the last non-stabilisation release). > IcedTea7 is now based on the IcedTea forest > (http://hg.openjdk.java.net/icedtea/jdk7) so this is a two stage > process involving pulling the latest changes into the forest and then > ensuring this builds with IcedTea7. > * Updating Shark/Zero in IcedTea7; ideally we would put this directly > into the forest, but I don't know how ready Gary is for this step. > * Updating the plugin/jaxws support; again it would be nice to have it > in the forest, but there probably isn't enough time. > * Any additional features from IcedTea6; we're not doing mass merges > any more because the two have diverged so far from each other that > this has become impractical (probably lots of conflicts and build > breakages for a few usable changes). doko and mjw have already > requested that --with-additional-vms and systemtap support be added. > > Any help would be much appreciated. Integration of Shark/Zero and the > plugin can be done fairly independently so if someone wants to work on > this, feel free. > Please add the visualvm fixes from IcedTea6 as well. Thanks! Lillian From bugzilla-daemon at icedtea.classpath.org Fri May 8 05:40:17 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 08 May 2009 12:40:17 +0000 Subject: [Bug 309] llvm: use --cxxflags not --cflags Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=309 thebohemian at gmx.net changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #5 from thebohemian at gmx.net 2009-05-08 12:40 ------- Pushed. -- 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 Fri May 8 05:44:51 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 13:44:51 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <4A0427F4.8050204@redhat.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <4A0427F4.8050204@redhat.com> Message-ID: <17c6771e0905080544h4f3e8ed2te55a3dbda0d33e43@mail.gmail.com> 2009/5/8 Lillian Angel : > Andrew John Hughes wrote: >> >> Dear all, >> >> Sun plan to release a JavaOne preview of JDK7 on May 21st >> (http://openjdk.java.net/projects/jdk7/milestones/). >> We'd like to do a corresponding release of IcedTea7 (1.10) around the >> same time, that can then be packaged in any distros that wish to ship >> such a preview. >> This will involve: >> >> * Updating IcedTea7 to support the latest build drop from Sun >> (currently b57, which is the last non-stabilisation release). >> IcedTea7 is now based on the IcedTea forest >> (http://hg.openjdk.java.net/icedtea/jdk7) so this is a two stage >> process involving pulling the latest changes into the forest and then >> ensuring this builds with IcedTea7. >> * Updating Shark/Zero in IcedTea7; ideally we would put this directly >> into the forest, but I don't know how ready Gary is for this step. >> * Updating the plugin/jaxws support; again it would be nice to have it >> in the forest, but there probably isn't enough time. >> * Any additional features from IcedTea6; we're not doing mass merges >> any more because the two have diverged so far from each other that >> this has become impractical (probably lots of conflicts and build >> breakages for a few usable changes). ?doko and mjw have already >> requested that --with-additional-vms and systemtap support be added. >> >> Any help would be much appreciated. ?Integration of Shark/Zero and the >> plugin can be done fairly independently so if someone wants to work on >> this, feel free. >> > > Please add the visualvm fixes from IcedTea6 as well. > > > Thanks! > Lillian > > Ah yeah, knew I'd forgotten something! 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 thebohemian at gmx.net Fri May 8 06:08:44 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Fri, 08 May 2009 15:08:44 +0200 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option Message-ID: <4A042EDC.40801@gmx.net> Hi, here is an updated version of the patch that adds the --enable-experimental-openjdk-cross-compilation option. The name is chosen deliberately because this feature is not complete yet and needs more patches. Furthermore allowing cross-compilation will consist of more than just disabling the sanity checks. 2009-05-08 Robert Schuster * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj and icedtea build. * configure.ac: New --enable-experimental-openjdk-cross-compilation option. * patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch file (SCA is in place for Robert Schuster). Regards Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: openjdk-cross-compilation-option.patch Type: text/x-patch Size: 5271 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090508/665bb322/openjdk-cross-compilation-option.patch -------------- 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/20090508/665bb322/signature.asc From gbenson at redhat.com Fri May 8 06:13:47 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 14:13:47 +0100 Subject: FYI: use --cxxflags In-Reply-To: <4A042433.8080005@gmx.net> References: <4A042433.8080005@gmx.net> Message-ID: <20090508131347.GC3190@redhat.com> Hi Robert, Robert Schuster wrote: > the attached patch makes shark compile using the --cxxflags llvm-config > provides. This makes us not miss some important flags. > > 2009-05-08 Robert Schuster > > * configure.ac: Use --cxxflags instead of --cflags for llvm-config. Please commit this. Cheers, Gary -- http://gbenson.net/ From gbenson at redhat.com Fri May 8 06:16:03 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 14:16:03 +0100 Subject: [PATCH] Always apply Zero and Shark patches Message-ID: <20090508131603.GD3190@redhat.com> Hi all, This patch makes the Zero and Shark patches be applied to all builds, not just Zero and Shark ones. Ok to commit? Cheers, Gary -- http://gbenson.net/ From gbenson at redhat.com Fri May 8 06:16:40 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 14:16:40 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <20090508131603.GD3190@redhat.com> References: <20090508131603.GD3190@redhat.com> Message-ID: <20090508131640.GE3190@redhat.com> Gary Benson wrote: > This patch makes the Zero and Shark patches be applied to > all builds, not just Zero and Shark ones. Ok to commit? *This* patch. The one thing I don't like about mutt is the way it makes you forget attachments... Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r 934d7b595b32 ChangeLog --- a/ChangeLog Fri May 08 11:24:32 2009 +0100 +++ b/ChangeLog Fri May 08 14:13:00 2009 +0100 @@ -1,3 +1,10 @@ +2009-05-08 Gary Benson + + * Makefile.am: Always apply Zero and Shark patches. + * patches/icedtea-test-atomic-operations.patch: Only test on Zero. + * patches/icedtea-eclipse-hotspot-6614100-7b24.patch: Removed. + * HACKING: Updated. + 2009-05-08 Gary Benson * Makefile.am: Removed patches and logic for building Zero and diff -r 934d7b595b32 HACKING --- a/HACKING Fri May 08 11:24:32 2009 +0100 +++ b/HACKING Fri May 08 14:13:00 2009 +0100 @@ -96,6 +96,12 @@ * icedtea-java2d-stroker-internal-joint.patch: Fix penultimate joint created by GeneralPath.closePath(). * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath(). * icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM. +* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. +* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. +* icedtea-signature-iterator.patch: Add zero-specific signature handling. +* 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. The following patches are only applied to OpenJDK6 in IcedTea6: @@ -107,6 +113,7 @@ * icedtea-timezone.patch : Makes java only look for time zone information in /etc/sysconfig/clock if /etc/localtime is not found (fix for rh-489586) * icedtea-dnd-filelists.patch: Fix drag and drop behaviour when dragging a file list between JVMs (S5079469). Backported from OpenJDK. +* icedtea-signed-types-hot6.patch: Make use of unsigned/signed types explicit. The following patches are only applied to OpenJDK in IcedTea: @@ -122,23 +129,6 @@ java.lang.Double and java.lang.Float. * icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar. (PR261) -The following patches are only applied for IcedTea builds using the zero-assembler: - -* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. -* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. -* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. -* icedtea-signature-iterator.patch: Add zero-specific signature handling. -* 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. - -The following patches are only applied for IcedTea builds not using the zero-assembler: - -* icedtea-signed-types-hot6.patch: Make use of unsigned/signed types explicit. - -The following patches are only applied for IcedTea builds using the Shark JIT: - -* icedtea-shark.patch: Add support for the Shark JIT. - The following patches are only applied when building with experimental NetX plugin support: * icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel. @@ -172,3 +162,4 @@ * icedtea-hotspot-citypeflow.patch: Not required with HS14. * icedtea-core-zero-build.patch: Not required with HS14. * icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14. +* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. Not required with HS14. diff -r 934d7b595b32 Makefile.am --- a/Makefile.am Fri May 08 11:24:32 2009 +0100 +++ b/Makefile.am Fri May 08 14:13:00 2009 +0100 @@ -459,21 +459,6 @@ patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch endif -# Zero patches -ZERO_PATCHES = \ - patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ - patches/icedtea-signature-iterator.patch \ - patches/icedtea-test-atomic-operations.patch \ - patches/icedtea-zero.patch \ - patches/icedtea-ia64-bugfix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch - -if ZERO_BUILD - ZERO_PATCHES_COND = $(ZERO_PATCHES) -else - ZERO_PATCHES_COND = -endif - # Patches needed when not using the newer OpenJDK 7 HotSpot OLD_HOTSPOT_PATCHES = \ patches/icedtea-signed-types-hot6.patch \ @@ -487,17 +472,15 @@ OLD_HOTSPOT_PATCHES_COND = $(OLD_HOTSPOT_PATCHES) endif -# If Shark is required, apply shark patch -if SHARK_BUILD - SHARK_PATCH = patches/hotspot/$(HSBUILD)/icedtea-shark.patch -else - SHARK_PATCH = -endif - ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ - $(ZERO_PATCHES_COND) \ + patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ + patches/icedtea-signature-iterator.patch \ + patches/icedtea-test-atomic-operations.patch \ + patches/icedtea-zero.patch \ + patches/icedtea-ia64-bugfix.patch \ + patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \ $(OLD_HOTSPOT_PATCHES_COND) \ patches/icedtea-version.patch \ patches/hotspot/$(HSBUILD)/icedtea-version.patch \ @@ -556,7 +539,7 @@ patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \ patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \ patches/icedtea-clean-crypto.patch \ - $(SHARK_PATCH) \ + patches/hotspot/$(HSBUILD)/icedtea-shark.patch \ $(GCC_PATCH) \ patches/icedtea-arch.patch \ patches/icedtea-lc_ctype.patch \ diff -r 934d7b595b32 patches/icedtea-eclipse-hotspot-6614100-7b24.patch --- a/patches/icedtea-eclipse-hotspot-6614100-7b24.patch Fri May 08 11:24:32 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ - -# HG changeset patch -# User never -# Date 1212727493 25200 -# Node ID 65fe2bd8883932456557957163bf5c4e4af79469 -# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837 -6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea -Reviewed-by: kvn, jrose, rasbold - ---- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Thu Jun 05 15:43:18 2008 -0700 -+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Thu Jun 05 21:44:53 2008 -0700 -@@ -1621,64 +1621,6 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bo - if (opt != NULL) return opt; - } - -- if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) { -- // Try to undo Phi of AddP: -- // (Phi (AddP base base y) (AddP base2 base2 y)) -- // becomes: -- // newbase := (Phi base base2) -- // (AddP newbase newbase y) -- // -- // This occurs as a result of unsuccessful split_thru_phi and -- // interferes with taking advantage of addressing modes. See the -- // clone_shift_expressions code in matcher.cpp -- Node* addp = in(1); -- const Type* type = addp->in(AddPNode::Base)->bottom_type(); -- Node* y = addp->in(AddPNode::Offset); -- if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) { -- // make sure that all the inputs are similar to the first one, -- // i.e. AddP with base == address and same offset as first AddP -- bool doit = true; -- for (uint i = 2; i < req(); i++) { -- if (in(i) == NULL || -- in(i)->Opcode() != Op_AddP || -- in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) || -- in(i)->in(AddPNode::Offset) != y) { -- doit = false; -- break; -- } -- // Accumulate type for resulting Phi -- type = type->meet(in(i)->in(AddPNode::Base)->bottom_type()); -- } -- Node* base = NULL; -- if (doit) { -- // Check for neighboring AddP nodes in a tree. -- // If they have a base, use that it. -- for (DUIterator_Fast kmax, k = this->fast_outs(kmax); k < kmax; k++) { -- Node* u = this->fast_out(k); -- if (u->is_AddP()) { -- Node* base2 = u->in(AddPNode::Base); -- if (base2 != NULL && !base2->is_top()) { -- if (base == NULL) -- base = base2; -- else if (base != base2) -- { doit = false; break; } -- } -- } -- } -- } -- if (doit) { -- if (base == NULL) { -- base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL); -- for (uint i = 1; i < req(); i++) { -- base->init_req(i, in(i)->in(AddPNode::Base)); -- } -- phase->is_IterGVN()->register_new_node_with_optimizer(base); -- } -- return new (phase->C, 4) AddPNode(base, base, y); -- } -- } -- } -- - // Split phis through memory merges, so that the memory merges will go away. - // Piggy-back this transformation on the search for a unique input.... - // It will be as if the merged memory is the unique value of the phi. - diff -r 934d7b595b32 patches/icedtea-test-atomic-operations.patch --- a/patches/icedtea-test-atomic-operations.patch Fri May 08 11:24:32 2009 +0100 +++ b/patches/icedtea-test-atomic-operations.patch Fri May 08 14:13:00 2009 +0100 @@ -5,11 +5,11 @@ jint result = JNI_ERR; DT_RETURN_MARK(CreateJavaVM, jint, (const jint&)result); -+ // We're about to use Atomic::xchg for locking. On zero platforms ++ // We're about to use Atomic::xchg for locking. On Zero platforms + // this is implemented using the GCC builtin __sync_lock_test_and_set + // which is not guaranteed to do what we're using it for on all + // platforms. So we check it works before doing anything else. -+#ifdef ASSERT ++#if defined(ZERO) && defined(ASSERT) + { + jint a = 0xCAFEBABE; + jint b = Atomic::xchg(0xC0FFEE, &a); @@ -18,7 +18,7 @@ + assert(a == 0xC0FFEE && b == (jint) 0xCAFEBABE, "Atomic::xchg() works"); + assert(c == &b && d == &a, "Atomic::xchg_ptr() works"); + } -+#endif // ASSERT ++#endif // ZERO && ASSERT + // At the moment it's only possible to have one Java VM, // since some of the runtime state is in global variables. From bugzilla-daemon at icedtea.classpath.org Fri May 8 06:16:54 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 08 May 2009 13:16:54 +0000 Subject: [Bug 310] icedtea6: icedtea patch to disable sanity checks Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=310 thebohemian at gmx.net changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #185 is|0 |1 obsolete| | ------- Comment #12 from thebohemian at gmx.net 2009-05-08 13:16 ------- Created an attachment (id=210) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=210&action=view) icedtea patch to (optionally) disable cross-compilation incompatible sanity checks -- 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 May 8 06:17:18 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 08 May 2009 13:17:18 +0000 Subject: [Bug 310] icedtea6: icedtea patch to disable sanity checks Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=310 ------- Comment #13 from thebohemian at gmx.net 2009-05-08 13:17 ------- Created an attachment (id=211) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=211&action=view) patch to allow configuring cross-compilation support -- 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 Fri May 8 06:17:37 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Fri, 08 May 2009 15:17:37 +0200 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option In-Reply-To: <4A042EDC.40801@gmx.net> References: <4A042EDC.40801@gmx.net> Message-ID: <4A0430F1.5090802@gmx.net> Hi, I also updated attachments in RPR 310: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=310 Regards Robert Robert Schuster schrieb: > Hi, > here is an updated version of the patch that adds the > --enable-experimental-openjdk-cross-compilation option. The name is > chosen deliberately because this feature is not complete yet and needs > more patches. Furthermore allowing cross-compilation will consist of > more than just disabling the sanity checks. > > 2009-05-08 Robert Schuster > > * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj > and icedtea build. > * configure.ac: New --enable-experimental-openjdk-cross-compilation > option. > * patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch > file (SCA is in place for Robert Schuster). > > 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/20090508/1fa24b64/signature.asc From gbenson at redhat.com Fri May 8 06:20:54 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 14:20:54 +0100 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option In-Reply-To: <4A042EDC.40801@gmx.net> References: <4A042EDC.40801@gmx.net> Message-ID: <20090508132053.GF3190@redhat.com> Robert Schuster wrote: > here is an updated version of the patch that adds the > --enable-experimental-openjdk-cross-compilation option. The name is > chosen deliberately because this feature is not complete yet and > needs more patches. Furthermore allowing cross-compilation will > consist of more than just disabling the sanity checks. Have you tested this to make sure it still works for normal builds? If so then I'm ok for you to commit this. Cheers, Gary -- http://gbenson.net/ From bugzilla-daemon at icedtea.classpath.org Fri May 8 06:28:57 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 08 May 2009 13:28:57 +0000 Subject: [Bug 310] icedtea6: icedtea patch to disable sanity checks Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=310 thebohemian at gmx.net changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #186 is|0 |1 obsolete| | -- 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 Fri May 8 06:41:43 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Fri, 08 May 2009 15:41:43 +0200 Subject: quilt for patch management? Message-ID: <4A043697.9000501@gmx.net> Hi, ever since fiddling with IcedTea's patches I was wondering why the Makefiles make no use of the quilt tool to manage patches. The tool would still allow us to have a directory where to place the patches and would make it more easy to manually apply them. Basically patch -p0 < would become quilt import -p0 and finally quilt push -a If someone wants to investigate manually quilt push/pop are there. Is this something you IcedTea developers would be interested in? 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/20090508/6a770c10/signature.asc From gnu_andrew at member.fsf.org Fri May 8 06:48:15 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 14:48:15 +0100 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option In-Reply-To: <4A042EDC.40801@gmx.net> References: <4A042EDC.40801@gmx.net> Message-ID: <17c6771e0905080648h7379720eva4a14afa270cb99d@mail.gmail.com> 2009/5/8 Robert Schuster : > Hi, > here is an updated version of the patch that adds the > --enable-experimental-openjdk-cross-compilation option. The name is > chosen deliberately because this feature is not complete yet and needs > more patches. Furthermore allowing cross-compilation will consist of > more than just disabling the sanity checks. > > 2009-05-08 ?Robert Schuster ? > > ? ?* Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj > ? ?and icedtea build. > ? ?* configure.ac: New --enable-experimental-openjdk-cross-compilation > ? ?option. > ? ?* patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch > ? ?file (SCA is in place for Robert Schuster). > > Regards > Robert > I'd still prefer that the option's name more clearly related to its purpose, as we discussed before, and that these were enabled by default where the host and build aliases differ. -- 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 aph at redhat.com Fri May 8 07:01:47 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 15:01:47 +0100 Subject: quilt for patch management? In-Reply-To: <4A043697.9000501@gmx.net> References: <4A043697.9000501@gmx.net> Message-ID: <4A043B4B.7080606@redhat.com> Robert Schuster wrote: > ever since fiddling with IcedTea's patches I was wondering why the > Makefiles make no use of the quilt tool to manage patches. The tool > would still allow us to have a directory where to place the patches and > would make it more easy to manually apply them. > > Basically > patch -p0 < > would become > quilt import -p0 > > and finally > quilt push -a > > If someone wants to investigate manually quilt push/pop are there. > > Is this something you IcedTea developers would be interested in? You haven't really explained what the point of this is. Andrew. From thebohemian at gmx.net Fri May 8 07:06:28 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Fri, 08 May 2009 16:06:28 +0200 Subject: quilt for patch management? In-Reply-To: <4A043B4B.7080606@redhat.com> References: <4A043697.9000501@gmx.net> <4A043B4B.7080606@redhat.com> Message-ID: <4A043C64.9070904@gmx.net> Hi, Andrew Haley schrieb: >> If someone wants to investigate manually quilt push/pop are there. >> >> Is this something you IcedTea developers would be interested in? > > You haven't really explained what the point of this is. My point is that this would make updating and integrating single patches easier. I don't know how you do this currently. As there is no special makefile rule for applying/removing a single patch I assume you do this manually which is IMHO more cumbersome than issueing 'quilt push' or 'quilt pop'. Furthermore how do you update a patch at the moment? Manually as well? quilt has a refresh command for this. It basically works like a poor man SCM sandbox. 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/20090508/03227d71/signature.asc From thebohemian at gmx.net Fri May 8 07:09:58 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Fri, 08 May 2009 16:09:58 +0200 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option In-Reply-To: <17c6771e0905080648h7379720eva4a14afa270cb99d@mail.gmail.com> References: <4A042EDC.40801@gmx.net> <17c6771e0905080648h7379720eva4a14afa270cb99d@mail.gmail.com> Message-ID: <4A043D36.70609@gmx.net> Hi Andrew, Andrew John Hughes schrieb: > 2009/5/8 Robert Schuster : >> Hi, >> here is an updated version of the patch that adds the >> --enable-experimental-openjdk-cross-compilation option. The name is >> chosen deliberately because this feature is not complete yet and needs >> more patches. Furthermore allowing cross-compilation will consist of >> more than just disabling the sanity checks. >> >> 2009-05-08 Robert Schuster >> >> * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj >> and icedtea build. >> * configure.ac: New --enable-experimental-openjdk-cross-compilation >> option. >> * patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch >> file (SCA is in place for Robert Schuster). >> >> Regards >> Robert >> > > I'd still prefer that the option's name more clearly related to its > purpose, as we discussed before, I think the name is what it does. It enables openjdk's cross-compilation support. At the moment this consists only of disabling the sanity checks but the next patch will handle calling 'uname -m' in certain places. As such I argue --disable-cc-incompatible-sanity-checks is not a good option (except you want 3 options related to cross-compilation in the end). > and that these were enabled by > default where the host and build aliases differ. This is already done. 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/20090508/0557cf32/signature.asc From thebohemian at gmx.net Fri May 8 07:12:53 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Fri, 08 May 2009 16:12:53 +0200 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option In-Reply-To: <20090508132053.GF3190@redhat.com> References: <4A042EDC.40801@gmx.net> <20090508132053.GF3190@redhat.com> Message-ID: <4A043DE5.2070005@gmx.net> Hi, Gary Benson schrieb: > > Have you tested this to make sure it still works for normal builds? > If so then I'm ok for you to commit this. just did a test build on my amd64 machine and it caused no change to this build. As such I committed the patch. 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/20090508/6b9ed4e8/signature.asc From aph at redhat.com Fri May 8 07:27:36 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 15:27:36 +0100 Subject: quilt for patch management? In-Reply-To: <4A043C64.9070904@gmx.net> References: <4A043697.9000501@gmx.net> <4A043B4B.7080606@redhat.com> <4A043C64.9070904@gmx.net> Message-ID: <4A044158.20909@redhat.com> Robert Schuster wrote: > Andrew Haley schrieb: >>> If someone wants to investigate manually quilt push/pop are there. >>> >>> Is this something you IcedTea developers would be interested in? >> You haven't really explained what the point of this is. > My point is that this would make updating and integrating single patches > easier. I don't know how you do this currently. As there is no special > makefile rule for applying/removing a single patch I assume you do this > manually which is IMHO more cumbersome than issueing 'quilt push' or > 'quilt pop'. OK. Why is it better to do patch -p0 < or quilt import -p0 I don't get it. Seriously, I'm baffled: how would it make any difference? > Furthermore how do you update a patch at the moment? Manually as well? > quilt has a refresh command for this. It basically works like a poor man > SCM sandbox. Updating patches is probably a bad thing. It makes more sense to apply the patch and your changes to pristine sources and regenerate. Andrew. From gnu_andrew at member.fsf.org Fri May 8 07:27:41 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 15:27:41 +0100 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option In-Reply-To: <4A043D36.70609@gmx.net> References: <4A042EDC.40801@gmx.net> <17c6771e0905080648h7379720eva4a14afa270cb99d@mail.gmail.com> <4A043D36.70609@gmx.net> Message-ID: <17c6771e0905080727w7d051f6bh17798298b6b37a49@mail.gmail.com> 2009/5/8 Robert Schuster : > Hi Andrew, > > Andrew John Hughes schrieb: >> 2009/5/8 Robert Schuster : >>> Hi, >>> here is an updated version of the patch that adds the >>> --enable-experimental-openjdk-cross-compilation option. The name is >>> chosen deliberately because this feature is not complete yet and needs >>> more patches. Furthermore allowing cross-compilation will consist of >>> more than just disabling the sanity checks. >>> >>> 2009-05-08 ?Robert Schuster ? >>> >>> ? ?* Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj >>> ? ?and icedtea build. >>> ? ?* configure.ac: New --enable-experimental-openjdk-cross-compilation >>> ? ?option. >>> ? ?* patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch >>> ? ?file (SCA is in place for Robert Schuster). >>> >>> Regards >>> Robert >>> >> >> I'd still prefer that the option's name more clearly related to its >> purpose, as we discussed before, > I think the name is what it does. It enables openjdk's cross-compilation > support. At the moment this consists only of disabling the sanity checks > but the next patch will handle calling 'uname -m' in certain places. As > such I argue --disable-cc-incompatible-sanity-checks is not a good > option (except you want 3 options related to cross-compilation in the end). > Three options that are rarely used but have a clear meaning over one mega-option where you have to look up what it actually does is preferable IMO. Plus, as you say below, those who are cross-compiling will get the option turned on by default anyway. >> and that these were enabled by >> default where the host and build aliases differ. > This is already done. > > Regards > Robert > > -- 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 Fri May 8 07:34:12 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 15:34:12 +0100 Subject: quilt for patch management? In-Reply-To: <4A043C64.9070904@gmx.net> References: <4A043697.9000501@gmx.net> <4A043B4B.7080606@redhat.com> <4A043C64.9070904@gmx.net> Message-ID: <17c6771e0905080734o27d058c8pa835f09f6044367@mail.gmail.com> 2009/5/8 Robert Schuster : > Hi, > > Andrew Haley schrieb: >>> If someone wants to investigate manually quilt push/pop are there. >>> >>> Is this something you IcedTea developers would be interested in? >> >> You haven't really explained what the point of this is. > My point is that this would make updating and integrating single patches > easier. I don't know how you do this currently. As there is no special > makefile rule for applying/removing a single patch I assume you do this > manually which is IMHO more cumbersome than issueing 'quilt push' or > 'quilt pop'. > They all get applied as part of the build. The current target is to remove most of them by having them pushed upstream. > Furthermore how do you update a patch at the moment? Manually as well? > quilt has a refresh command for this. It basically works like a poor man > SCM sandbox. > Personally, if the build fails on a patch, I reapply it against the current sources and fix any conflicts. I have a script to speed this up. It just greps the patch, and creates two directory trees containing the appropriate original files form OpenJDK. I then apply the patch to one and resolve any issues, before creating a new patch. It may not be the most efficient way but it works for me and has been well-tested. I'm reluctant to trust the process to a tool I don't know very well, especially if that tool is expected to work for all developers using IcedTea. It just seems to complicate things unnecessarily IMO. The time spent switching to quilt would be better spent getting patches upstream. > Regards > Robert > > > > -- 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 Fri May 8 07:39:56 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 15:39:56 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <20090508131640.GE3190@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> Message-ID: <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> 2009/5/8 Gary Benson : > Gary Benson wrote: >> This patch makes the Zero and Shark patches be applied to >> all builds, not just Zero and Shark ones. ?Ok to commit? > > *This* patch. ?The one thing I don't like about mutt is the > way it makes you forget attachments... > > Cheers, > Gary > > -- > http://gbenson.net/ > Very cool. Please commit. Are all the Zero/Shark patches in this change SCAed? If so, I'd like to just push them (or rather the 7 equivalents) into the IcedTea forest for 7. 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 gbenson at redhat.com Fri May 8 07:43:14 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 15:43:14 +0100 Subject: quilt for patch management? In-Reply-To: <17c6771e0905080734o27d058c8pa835f09f6044367@mail.gmail.com> References: <4A043697.9000501@gmx.net> <4A043B4B.7080606@redhat.com> <4A043C64.9070904@gmx.net> <17c6771e0905080734o27d058c8pa835f09f6044367@mail.gmail.com> Message-ID: <20090508144314.GG3190@redhat.com> Andrew John Hughes wrote: > The time spent switching to quilt would be better spent getting > patches upstream. Definitely. Cheers, Gary -- http://gbenson.net/ From robertschuster at fsfe.org Fri May 8 05:33:04 2009 From: robertschuster at fsfe.org (Robert Schuster) Date: Fri, 08 May 2009 12:33:04 +0000 Subject: changeset in /hg/icedtea6: 2009-05-08 Robert Schuster changeset acaa4872ca75 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=acaa4872ca75 description: 2009-05-08 Robert Schuster * configure.ac: Use --cxxflags instead of --cflags for llvm-config. diffstat: 2 files changed, 5 insertions(+), 1 deletion(-) ChangeLog | 4 ++++ configure.ac | 2 +- diffs (23 lines): diff -r 934d7b595b32 -r acaa4872ca75 ChangeLog --- a/ChangeLog Fri May 08 11:24:32 2009 +0100 +++ b/ChangeLog Fri May 08 14:21:44 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-08 Gary Benson + + * configure.ac: Use --cxxflags instead of --cflags for llvm-config. + 2009-05-08 Gary Benson * Makefile.am: Removed patches and logic for building Zero and diff -r 934d7b595b32 -r acaa4872ca75 configure.ac --- a/configure.ac Fri May 08 11:24:32 2009 +0100 +++ b/configure.ac Fri May 08 14:21:44 2009 +0200 @@ -564,7 +564,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te 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_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \ + 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'` LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`" From gbenson at redhat.com Fri May 8 07:47:39 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 15:47:39 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> Message-ID: <20090508144739.GH3190@redhat.com> Andrew John Hughes wrote: > 2009/5/8 Gary Benson : > > Gary Benson wrote: > > > This patch makes the Zero and Shark patches be applied to > > > all builds, not just Zero and Shark ones. ?Ok to commit? > > > > *This* patch. ?The one thing I don't like about mutt is the > > way it makes you forget attachments... > > Very cool. Please commit. > > Are all the Zero/Shark patches in this change SCAed? If doko and xranby are both covered then... probably. For the purposes of disambiguation, can you tell me exactly the patches you plan to push, and I'll confirm them individually. > If so, I'd like to just push them (or rather the 7 equivalents) > into the IcedTea forest for 7. What is the process for going from there to the OpenJDK forest? Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Fri May 8 07:49:12 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 15:49:12 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <20090508144739.GH3190@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> Message-ID: <4A044668.6090900@redhat.com> Gary Benson wrote: > Andrew John Hughes wrote: >> 2009/5/8 Gary Benson : >>> Gary Benson wrote: >>>> This patch makes the Zero and Shark patches be applied to >>>> all builds, not just Zero and Shark ones. Ok to commit? >>> *This* patch. The one thing I don't like about mutt is the >>> way it makes you forget attachments... >> Very cool. Please commit. >> >> Are all the Zero/Shark patches in this change SCAed? > > If doko and xranby are both covered then... probably. > For the purposes of disambiguation, can you tell me exactly the > patches you plan to push, and I'll confirm them individually. > >> If so, I'd like to just push them (or rather the 7 equivalents) >> into the IcedTea forest for 7. > > What is the process for going from there to the OpenJDK forest? Same as anything else: open a bug, create a webrev, and apply for permission to push it. Andrew. From gbenson at redhat.com Fri May 8 07:49:06 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 08 May 2009 14:49:06 +0000 Subject: changeset in /hg/icedtea6: 2009-05-08 Gary Benson changeset b9c3b68cc5d7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b9c3b68cc5d7 description: 2009-05-08 Gary Benson * Makefile.am: Always apply Zero and Shark patches. * patches/icedtea-test-atomic-operations.patch: Only test on Zero. * patches/icedtea-eclipse-hotspot-6614100-7b24.patch: Removed. * HACKING: Updated. diffstat: 5 files changed, 25 insertions(+), 121 deletions(-) ChangeLog | 7 + HACKING | 25 ++---- Makefile.am | 31 +------- patches/icedtea-eclipse-hotspot-6614100-7b24.patch | 77 -------------------- patches/icedtea-test-atomic-operations.patch | 6 - diffs (232 lines): diff -r bce6f516052d -r b9c3b68cc5d7 ChangeLog --- a/ChangeLog Fri May 08 14:47:09 2009 +0100 +++ b/ChangeLog Fri May 08 15:49:54 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-08 Andrew Haley + + * Makefile.am: Always apply Zero and Shark patches. + * patches/icedtea-test-atomic-operations.patch: Only test on Zero. + * patches/icedtea-eclipse-hotspot-6614100-7b24.patch: Removed. + * HACKING: Updated. + 2009-05-08 Andrew Haley * patches/icedtea-lcms-2.patch: Work around lcms breakage. See diff -r bce6f516052d -r b9c3b68cc5d7 HACKING --- a/HACKING Fri May 08 14:47:09 2009 +0100 +++ b/HACKING Fri May 08 15:49:54 2009 +0100 @@ -97,6 +97,12 @@ The following patches are currently appl * icedtea-java2d-stroker-internal-joint.patch: Fix penultimate joint created by GeneralPath.closePath(). * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath(). * icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM. +* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. +* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. +* icedtea-signature-iterator.patch: Add zero-specific signature handling. +* 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. The following patches are only applied to OpenJDK6 in IcedTea6: @@ -108,6 +114,7 @@ The following patches are only applied t * icedtea-timezone.patch : Makes java only look for time zone information in /etc/sysconfig/clock if /etc/localtime is not found (fix for rh-489586) * icedtea-dnd-filelists.patch: Fix drag and drop behaviour when dragging a file list between JVMs (S5079469). Backported from OpenJDK. +* icedtea-signed-types-hot6.patch: Make use of unsigned/signed types explicit. The following patches are only applied to OpenJDK in IcedTea: @@ -122,23 +129,6 @@ The following patches are only applied t calls, replace hexadecimal floating point literals with decimal variants in java.lang.Double and java.lang.Float. * icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar. (PR261) - -The following patches are only applied for IcedTea builds using the zero-assembler: - -* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. -* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. -* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. -* icedtea-signature-iterator.patch: Add zero-specific signature handling. -* 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. - -The following patches are only applied for IcedTea builds not using the zero-assembler: - -* icedtea-signed-types-hot6.patch: Make use of unsigned/signed types explicit. - -The following patches are only applied for IcedTea builds using the Shark JIT: - -* icedtea-shark.patch: Add support for the Shark JIT. The following patches are only applied when building with experimental NetX plugin support: @@ -173,3 +163,4 @@ changes to the OpenJDK code base and/or * icedtea-hotspot-citypeflow.patch: Not required with HS14. * icedtea-core-zero-build.patch: Not required with HS14. * icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14. +* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. Not required with HS14. diff -r bce6f516052d -r b9c3b68cc5d7 Makefile.am --- a/Makefile.am Fri May 08 14:47:09 2009 +0100 +++ b/Makefile.am Fri May 08 15:49:54 2009 +0100 @@ -459,21 +459,6 @@ else patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch endif -# Zero patches -ZERO_PATCHES = \ - patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ - patches/icedtea-signature-iterator.patch \ - patches/icedtea-test-atomic-operations.patch \ - patches/icedtea-zero.patch \ - patches/icedtea-ia64-bugfix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch - -if ZERO_BUILD - ZERO_PATCHES_COND = $(ZERO_PATCHES) -else - ZERO_PATCHES_COND = -endif - # Patches needed when not using the newer OpenJDK 7 HotSpot OLD_HOTSPOT_PATCHES = \ patches/icedtea-signed-types-hot6.patch \ @@ -487,17 +472,15 @@ else OLD_HOTSPOT_PATCHES_COND = $(OLD_HOTSPOT_PATCHES) endif -# If Shark is required, apply shark patch -if SHARK_BUILD - SHARK_PATCH = patches/hotspot/$(HSBUILD)/icedtea-shark.patch -else - SHARK_PATCH = -endif - ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ - $(ZERO_PATCHES_COND) \ + patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ + patches/icedtea-signature-iterator.patch \ + patches/icedtea-test-atomic-operations.patch \ + patches/icedtea-zero.patch \ + patches/icedtea-ia64-bugfix.patch \ + patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \ $(OLD_HOTSPOT_PATCHES_COND) \ patches/icedtea-version.patch \ patches/hotspot/$(HSBUILD)/icedtea-version.patch \ @@ -557,7 +540,7 @@ ICEDTEA_PATCHES = \ patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \ patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \ patches/icedtea-clean-crypto.patch \ - $(SHARK_PATCH) \ + patches/hotspot/$(HSBUILD)/icedtea-shark.patch \ $(GCC_PATCH) \ patches/icedtea-arch.patch \ patches/icedtea-lc_ctype.patch \ diff -r bce6f516052d -r b9c3b68cc5d7 patches/icedtea-eclipse-hotspot-6614100-7b24.patch --- a/patches/icedtea-eclipse-hotspot-6614100-7b24.patch Fri May 08 14:47:09 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ - -# HG changeset patch -# User never -# Date 1212727493 25200 -# Node ID 65fe2bd8883932456557957163bf5c4e4af79469 -# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837 -6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea -Reviewed-by: kvn, jrose, rasbold - ---- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Thu Jun 05 15:43:18 2008 -0700 -+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp Thu Jun 05 21:44:53 2008 -0700 -@@ -1621,64 +1621,6 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bo - if (opt != NULL) return opt; - } - -- if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) { -- // Try to undo Phi of AddP: -- // (Phi (AddP base base y) (AddP base2 base2 y)) -- // becomes: -- // newbase := (Phi base base2) -- // (AddP newbase newbase y) -- // -- // This occurs as a result of unsuccessful split_thru_phi and -- // interferes with taking advantage of addressing modes. See the -- // clone_shift_expressions code in matcher.cpp -- Node* addp = in(1); -- const Type* type = addp->in(AddPNode::Base)->bottom_type(); -- Node* y = addp->in(AddPNode::Offset); -- if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) { -- // make sure that all the inputs are similar to the first one, -- // i.e. AddP with base == address and same offset as first AddP -- bool doit = true; -- for (uint i = 2; i < req(); i++) { -- if (in(i) == NULL || -- in(i)->Opcode() != Op_AddP || -- in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) || -- in(i)->in(AddPNode::Offset) != y) { -- doit = false; -- break; -- } -- // Accumulate type for resulting Phi -- type = type->meet(in(i)->in(AddPNode::Base)->bottom_type()); -- } -- Node* base = NULL; -- if (doit) { -- // Check for neighboring AddP nodes in a tree. -- // If they have a base, use that it. -- for (DUIterator_Fast kmax, k = this->fast_outs(kmax); k < kmax; k++) { -- Node* u = this->fast_out(k); -- if (u->is_AddP()) { -- Node* base2 = u->in(AddPNode::Base); -- if (base2 != NULL && !base2->is_top()) { -- if (base == NULL) -- base = base2; -- else if (base != base2) -- { doit = false; break; } -- } -- } -- } -- } -- if (doit) { -- if (base == NULL) { -- base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL); -- for (uint i = 1; i < req(); i++) { -- base->init_req(i, in(i)->in(AddPNode::Base)); -- } -- phase->is_IterGVN()->register_new_node_with_optimizer(base); -- } -- return new (phase->C, 4) AddPNode(base, base, y); -- } -- } -- } -- - // Split phis through memory merges, so that the memory merges will go away. - // Piggy-back this transformation on the search for a unique input.... - // It will be as if the merged memory is the unique value of the phi. - diff -r bce6f516052d -r b9c3b68cc5d7 patches/icedtea-test-atomic-operations.patch --- a/patches/icedtea-test-atomic-operations.patch Fri May 08 14:47:09 2009 +0100 +++ b/patches/icedtea-test-atomic-operations.patch Fri May 08 15:49:54 2009 +0100 @@ -5,11 +5,11 @@ diff -r d384f5a5bd0c hotspot/src/share/v jint result = JNI_ERR; DT_RETURN_MARK(CreateJavaVM, jint, (const jint&)result); -+ // We're about to use Atomic::xchg for locking. On zero platforms ++ // We're about to use Atomic::xchg for locking. On Zero platforms + // this is implemented using the GCC builtin __sync_lock_test_and_set + // which is not guaranteed to do what we're using it for on all + // platforms. So we check it works before doing anything else. -+#ifdef ASSERT ++#if defined(ZERO) && defined(ASSERT) + { + jint a = 0xCAFEBABE; + jint b = Atomic::xchg(0xC0FFEE, &a); @@ -18,7 +18,7 @@ diff -r d384f5a5bd0c hotspot/src/share/v + assert(a == 0xC0FFEE && b == (jint) 0xCAFEBABE, "Atomic::xchg() works"); + assert(c == &b && d == &a, "Atomic::xchg_ptr() works"); + } -+#endif // ASSERT ++#endif // ZERO && ASSERT + // At the moment it's only possible to have one Java VM, // since some of the runtime state is in global variables. From ahughes at redhat.com Fri May 8 07:51:41 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 08 May 2009 14:51:41 +0000 Subject: changeset in /hg/icedtea: Post 1.9 updates: Bump to 1.10-pre and... Message-ID: changeset bf7c34ac17a5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bf7c34ac17a5 description: Post 1.9 updates: Bump to 1.10-pre and switch to using IcedTea7 forest. 2009-03-20 Andrew John Hughes * Makefile.am: Switch to IcedTea forest rather than build drop x. * NEWS, * configure.ac: Prepare for next release. diffstat: 4 files changed, 12 insertions(+), 5 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 6 ++---- NEWS | 2 ++ configure.ac | 2 +- diffs (60 lines): diff -r 9933c527970b -r bf7c34ac17a5 ChangeLog --- a/ChangeLog Fri Mar 20 11:42:36 2009 +0000 +++ b/ChangeLog Fri Mar 20 11:57:47 2009 +0000 @@ -1,3 +1,10 @@ 2009-03-20 Andrew John Hughes + + * Makefile.am: Switch to IcedTea + forest rather than build drop x. + * NEWS, + * configure.ac: Prepare for next release. + 2009-03-20 Andrew John Hughes * NEWS: Add release date for 1.9. diff -r 9933c527970b -r bf7c34ac17a5 Makefile.am --- a/Makefile.am Fri Mar 20 11:42:36 2009 +0000 +++ b/Makefile.am Fri Mar 20 11:57:47 2009 +0000 @@ -1,6 +1,4 @@ OPENJDK_DATE = 05_mar_2009 -OPENJDK_DATE = 05_mar_2009 OPENJDK_MD5SUM = a451251ebdd9a219b16429369fa72e2a -OPENJDK_VERSION = b50 CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa @@ -1516,7 +1514,7 @@ BSD_HG_URL = http://hg.openjdk.java.net/ BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/ -OPENJDK_URL = http://www.java.net/download/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/ +OPENJDK_URL = http://hg.openjdk.java.net/icedtea/jdk7/archive/ if USE_ALT_OPENJDK_SRC_ZIP OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) @@ -1524,7 +1522,7 @@ if USE_HG if USE_HG OPENJDK_SRC_ZIP = else - OPENJDK_SRC_ZIP = openjdk-7-ea-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).zip + OPENJDK_SRC_ZIP = tip.tar.gz endif endif diff -r 9933c527970b -r bf7c34ac17a5 NEWS --- a/NEWS Fri Mar 20 11:42:36 2009 +0000 +++ b/NEWS Fri Mar 20 11:57:47 2009 +0000 @@ -1,3 +1,5 @@ New in release 1.9 (2009-03-20) +New in release 1.10 (XXXX-XX-XX) + New in release 1.9 (2009-03-20) - Security fixes for: diff -r 9933c527970b -r bf7c34ac17a5 configure.ac --- a/configure.ac Fri Mar 20 11:42:36 2009 +0000 +++ b/configure.ac Fri Mar 20 11:57:47 2009 +0000 @@ -1,4 +1,4 @@ AC_INIT([icedtea], [1.9], [distro-pkg-de -AC_INIT([icedtea], [1.9], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [1.10-pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.10 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) AC_CANONICAL_HOST From ahughes at redhat.com Fri May 8 07:51:42 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 08 May 2009 14:51:42 +0000 Subject: changeset in /hg/icedtea: Support building current IcedTea forest. Message-ID: changeset 1fe13f115ab0 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1fe13f115ab0 description: Support building current IcedTea forest. 2009-04-16 Andrew John Hughes * patches/icedtea-java2d-dasher.patch, * patches/icedtea-jscheme.patch, * patches/icedtea-snmp.patch: Dropped, first two upstream, default of no binary plugs makes third obsolete. * Makefile.am: Updated. * acinclude.m4: Find IcedTea on F10. * patches/ecj/icedtea.patch, * patches/icedtea-alpha-fixes.patch, * patches/icedtea-arch.patch, * patches/icedtea-doc-headers.patch, * patches/icedtea-gcc-suffix.patch, * patches/icedtea-libraries.patch, * patches/icedtea-linker-libs-order.patch, * patches/icedtea-tests-jdk.patch, * patches/icedtea-uname.patch, * patches/icedtea-zero-build.patch: Recreated. diffstat: 16 files changed, 384 insertions(+), 1955 deletions(-) ChangeLog | 21 Makefile.am | 5 acinclude.m4 | 3 patches/ecj/icedtea.patch | 161 ++- patches/icedtea-alpha-fixes.patch | 30 patches/icedtea-arch.patch | 32 patches/icedtea-doc-headers.patch | 53 - patches/icedtea-gcc-suffix.patch | 16 patches/icedtea-java2d-dasher.patch | 11 patches/icedtea-jscheme.patch | 1262 ------------------------------- patches/icedtea-libraries.patch | 246 +++--- patches/icedtea-linker-libs-order.patch | 20 patches/icedtea-snmp.patch | 235 ----- patches/icedtea-tests-jdk.patch | 85 -- patches/icedtea-uname.patch | 50 - patches/icedtea-zero-build.patch | 109 +- diffs (truncated from 3655 to 500 lines): diff -r bf7c34ac17a5 -r 1fe13f115ab0 ChangeLog --- a/ChangeLog Fri Mar 20 11:57:47 2009 +0000 +++ b/ChangeLog Wed Apr 22 16:53:21 2009 +0100 @@ -1,3 +1,24 @@ 2009-03-20 Andrew John Hughes + + * patches/icedtea-java2d-dasher.patch, + * patches/icedtea-jscheme.patch, + * patches/icedtea-snmp.patch: + Dropped, first two upstream, default of + no binary plugs makes third obsolete. + * Makefile.am: Updated. + * acinclude.m4: Find IcedTea on F10. + * patches/ecj/icedtea.patch, + * patches/icedtea-alpha-fixes.patch, + * patches/icedtea-arch.patch, + * patches/icedtea-doc-headers.patch, + * patches/icedtea-gcc-suffix.patch, + * patches/icedtea-libraries.patch, + * patches/icedtea-linker-libs-order.patch, + * patches/icedtea-tests-jdk.patch, + * patches/icedtea-uname.patch, + * patches/icedtea-zero-build.patch: + Recreated. + 2009-03-20 Andrew John Hughes * Makefile.am: Switch to IcedTea diff -r bf7c34ac17a5 -r 1fe13f115ab0 Makefile.am --- a/Makefile.am Fri Mar 20 11:57:47 2009 +0000 +++ b/Makefile.am Wed Apr 22 16:53:21 2009 +0100 @@ -1741,8 +1741,7 @@ endif endif ICEDTEA_FSG_PATCHES = \ - patches/icedtea-idl.patch \ - patches/icedtea-jscheme.patch + patches/icedtea-idl.patch ICEDTEA_PATCHES = \ patches/icedtea-version.patch \ @@ -1806,7 +1805,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-javac-debuginfo.patch \ patches/icedtea-xjc.patch \ patches/icedtea-renderer-crossing.patch \ - patches/icedtea-snmp.patch \ patches/icedtea-tests-jdk.patch \ patches/icedtea-stroker-finish.patch \ patches/icedtea-alsa-default-device.patch \ @@ -1826,7 +1824,6 @@ ICEDTEA_PATCHES = \ patches/security/icedtea-6766136.patch \ patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ patches/icedtea-demo-swingapplet.patch \ - patches/icedtea-java2d-dasher.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-xml-encodinginfo.patch \ patches/icedtea-cc-interp-backedge.patch \ diff -r bf7c34ac17a5 -r 1fe13f115ab0 acinclude.m4 --- a/acinclude.m4 Fri Mar 20 11:57:47 2009 +0000 +++ b/acinclude.m4 Wed Apr 22 16:53:21 2009 +0100 @@ -1164,7 +1164,8 @@ AC_DEFUN([AC_CHECK_FOR_ICEDTEA], SYSTEM_ICEDTEA_DIR= ]) if test -z "${SYSTEM_ICEDTEA_DIR}"; then - for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do + for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \ + /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do if test -d $dir; then SYSTEM_ICEDTEA_DIR=$dir break diff -r bf7c34ac17a5 -r 1fe13f115ab0 patches/ecj/icedtea.patch --- a/patches/ecj/icedtea.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/ecj/icedtea.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/corba/make/co diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile ---- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-02-05 08:40:51.000000000 +0000 -+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-03-20 11:54:59.000000000 +0000 ++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-04-16 18:21:48.000000000 +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-ecj.orig/corba/make/co diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile --- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-02-10 19:24:54.000000000 +0000 ++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -0,0 +1,38 @@ +# +# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. @@ -53,8 +53,8 @@ diff -Nru openjdk-ecj.orig/corba/make/co +# +include $(BUILDDIR)/common/Classes.gmk diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk ---- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-02-05 08:40:51.000000000 +0000 -+++ openjdk-ecj/corba/make/common/Defs.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-03-20 11:54:59.000000000 +0000 ++++ openjdk-ecj/corba/make/common/Defs.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -53,6 +53,13 @@ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) @@ -88,8 +88,8 @@ diff -Nru openjdk-ecj.orig/corba/make/co vpath %.java $(VPATH.java) vpath %.class $(CLASSBINDIR) diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk ---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -276,7 +276,7 @@ fi; \ done) @@ -100,14 +100,14 @@ diff -Nru openjdk-ecj.orig/corba/make/co # # We want to privatize JVM symbols on Solaris. This is so the user can diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk ---- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-02-05 08:40:51.000000000 +0000 -+++ openjdk-ecj/corba/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000 -@@ -197,8 +197,10 @@ +--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-04-14 15:55:17.000000000 +0100 ++++ openjdk-ecj/corba/make/common/Rules.gmk 2009-04-16 18:35:11.000000000 +0100 +@@ -201,8 +201,10 @@ $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ $(CAT) $(JAVA_SOURCE_LIST); \ $(ECHO) "# Running javac:"; \ -- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ + -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ @@ -116,16 +116,16 @@ diff -Nru openjdk-ecj.orig/corba/make/co @$(java-vm-cleanup) diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk ---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-02-10 19:24:54.000000000 +0000 -@@ -110,31 +110,13 @@ +--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-04-16 18:32:43.000000000 +0100 +@@ -113,31 +113,14 @@ JAVACFLAGS += $(OTHER_JAVACFLAGS) # Needed for javah --JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) -+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) - --# Langtools +-JAVAHFLAGS += -classpath $(CLASSBINDIR) ++JAVAHFLAGS += -classpath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + + # Langtools -ifdef LANGTOOLS_DIST - JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar - JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar @@ -143,20 +143,22 @@ diff -Nru openjdk-ecj.orig/corba/make/co -else - # If no explicit tools, use boot tools (add VM flags in this case) - JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ +- $(JAVACFLAGS) +- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ +- $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif +# If no explicit tools, use boot tools (add VM flags in this case) +JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ - $(JAVACFLAGS) -- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ ++ $(JAVACFLAGS) +JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ - $(JAVAHFLAGS) -- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) --endif ++ $(JAVAHFLAGS) # Override of what javac to use (see deploy workspace) ifdef JAVAC diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile ---- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-02-05 08:40:51.000000000 +0000 -+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-03-20 11:54:59.000000000 +0000 ++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -93,8 +93,6 @@ POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) @@ -234,8 +236,8 @@ diff -Nru openjdk-ecj.orig/corba/make/or pi.compile: $(PIGENERATEDFILES) diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile ---- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 18:11:57.000000000 +0000 -+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-04-14 15:55:18.000000000 +0100 ++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -172,7 +172,6 @@ ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%) @@ -253,8 +255,8 @@ diff -Nru openjdk-ecj.orig/corba/make/su portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES) diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml ---- openjdk-ecj.orig/jaxp/make/build.xml 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxp/make/build.xml 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxp/make/build.xml 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxp/make/build.xml 2009-04-16 18:21:48.000000000 +0100 @@ -71,7 +71,10 @@ diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile ---- openjdk-ecj.orig/jaxp/make/Makefile 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxp/make/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxp/make/Makefile 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxp/make/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -75,7 +75,7 @@ endif @@ -289,8 +291,8 @@ diff -Nru openjdk-ecj.orig/jaxp/make/Mak ifdef ALT_OUTPUTDIR diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties ---- openjdk-ecj.orig/jaxws/make/build.properties 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxws/make/build.properties 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxws/make/build.properties 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxws/make/build.properties 2009-04-16 18:21:48.000000000 +0100 @@ -37,7 +37,7 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = @@ -301,8 +303,8 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu # JVM memory size javac.memoryInitialSize = 128m diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml ---- openjdk-ecj.orig/jaxws/make/build.xml 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxws/make/build.xml 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxws/make/build.xml 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxws/make/build.xml 2009-04-16 18:21:48.000000000 +0100 @@ -84,7 +84,10 @@ diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile ---- openjdk-ecj.orig/jaxws/make/Makefile 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jaxws/make/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jaxws/make/Makefile 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jaxws/make/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -75,8 +75,8 @@ endif @@ -347,8 +349,8 @@ diff -Nru openjdk-ecj.orig/jaxws/make/Ma ifdef ALT_OUTPUTDIR diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk ---- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-02-05 08:44:12.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -43,7 +43,8 @@ @$(prep-target) @$(MKDIR) -p $(BUILDTOOLCLASSDIR) @@ -360,8 +362,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \ $(BOOT_JAR_JFLAGS) || $(RM) $@ diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk ---- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-02-10 18:12:01.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/Release.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-04-16 15:16:31.000000000 +0100 ++++ openjdk-ecj/jdk/make/common/Release.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -651,10 +651,23 @@ $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) $(prep-target) @@ -447,8 +449,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES)) endif # !windows diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk ---- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-02-05 08:44:12.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -237,8 +237,9 @@ $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \ $(CAT) $<.filtered; \ @@ -475,14 +477,17 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm @$(TOUCH) $@ diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk ---- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-02-10 19:24:54.000000000 +0000 -@@ -121,30 +121,19 @@ +--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-04-16 18:28:27.000000000 +0100 +@@ -129,33 +129,22 @@ JAVACFLAGS += $(OTHER_JAVACFLAGS) # Needed for javah -JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) +JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + + # Needed for JAVADOC and BOOT_JAVACFLAGS + NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true # Langtools ifdef LANGTOOLS_DIST @@ -510,8 +515,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm # Override of what javac to use (see deploy workspace) diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile ---- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-02-05 08:44:13.000000000 +0000 -+++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -31,7 +31,7 @@ PACKAGE = java.nio LIBRARY = nio @@ -522,8 +527,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/java NIO_SRC = $(SHARE_SRC)/classes/java/nio diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile ---- openjdk-ecj.orig/jdk/make/java/text/Makefile 2009-02-05 08:44:13.000000000 +0000 -+++ openjdk-ecj/jdk/make/java/text/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/java/text/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -80,8 +80,8 @@ -sourcepath $(TEXT_SRCDIR) \ $(TEXT_SOURCES) @@ -536,8 +541,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/java -spec $(UNICODEDATA)/UnicodeData.txt @$(java-vm-cleanup) diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile ---- openjdk-ecj.orig/jdk/make/Makefile 2009-02-05 08:44:12.000000000 +0000 -+++ openjdk-ecj/jdk/make/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -239,7 +239,7 @@ all build:: sanity-all post-sanity-all @@ -548,8 +553,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/Make $(SUBDIRS-loop) diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk ---- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-02-05 08:44:14.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -188,3 +188,5 @@ java/awt/dnd/DnDConstants.java \ sun/awt/CausedFocusEvent.java @@ -557,9 +562,9 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/ +EXPORTED_inner = \ + sun.java2d.opengl.OGLContext$$OGLContextCaps diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile ---- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2009-02-05 08:44:14.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-02-10 19:24:54.000000000 +0000 -@@ -395,10 +395,9 @@ +--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2009-04-14 15:55:52.000000000 +0100 ++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-04-16 18:21:48.000000000 +0100 +@@ -400,10 +400,9 @@ COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ @@ -574,8 +579,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/ fontconfigs.clean : diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile ---- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2009-02-05 08:44:14.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -62,7 +62,8 @@ $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES) $(RM) -r $(@D) @@ -587,8 +592,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/ $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile ---- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2009-02-05 08:44:14.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2009-03-20 11:58:37.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -85,8 +85,9 @@ $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \ -sourcepath $(TEXT_SRCDIR) \ @@ -602,8 +607,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/ -spec $(UNICODEDATA)/UnicodeData.txt \ -language th diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile ---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-02-10 18:12:01.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-04-16 15:16:31.000000000 +0100 ++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -276,11 +276,7 @@ TEMPDIR_CLASSES = $(TEMPDIR)/classes @@ -641,8 +646,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/ done $(TOUCH) $@ diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java ---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-02-10 18:11:22.000000000 +0000 -+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-04-16 15:15:29.000000000 +0100 ++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-04-16 18:21:48.000000000 +0100 @@ -647,9 +647,6 @@ throws FileNotFoundException, IOException { BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName)); @@ -662,8 +667,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool if (plane == 0 && bLatin1 == false) { genCaseMapTableDeclaration(result); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java ---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-02-10 18:11:12.000000000 +0000 -+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-04-16 15:15:12.000000000 +0100 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-04-16 18:21:48.000000000 +0100 @@ -76,7 +76,7 @@ * {@code 0x1.fffffffffffffP+1023} and also equal to * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. @@ -692,8 +697,8 @@ diff -Nru openjdk-ecj.orig/jdk/src/share /** * Maximum exponent a finite {@code double} variable may have. diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java ---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-02-10 18:11:12.000000000 +0000 -+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-04-16 15:15:12.000000000 +0100 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-04-16 18:21:48.000000000 +0100 @@ -76,7 +76,7 @@ * {@code 0x1.fffffeP+127f} and also equal to * {@code Float.intBitsToFloat(0x7f7fffff)}. @@ -722,8 +727,8 @@ diff -Nru openjdk-ecj.orig/jdk/src/share /** * Maximum exponent a finite {@code float} variable may have. It diff -Nru openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h ---- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-02-05 08:44:52.000000000 +0000 -+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-20 11:58:43.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-04-16 18:21:48.000000000 +0100 @@ -27,6 +27,7 @@ #define OGLContext_h_Included @@ -789,8 +794,8 @@ diff -Nru openjdk-ecj.orig/jdk/src/share /** * Evaluates to true if the given capability bitmask is present for the diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml ---- openjdk-ecj.orig/langtools/make/build.xml 2009-02-05 08:45:36.000000000 +0000 -+++ openjdk-ecj/langtools/make/build.xml 2009-02-10 19:56:00.000000000 +0000 +--- openjdk-ecj.orig/langtools/make/build.xml 2009-03-20 11:58:59.000000000 +0000 ++++ openjdk-ecj/langtools/make/build.xml 2009-04-16 18:21:48.000000000 +0100 @@ -502,7 +502,9 @@ includes="@{includes}" sourcepath="" @@ -824,8 +829,8 @@ diff -Nru openjdk-ecj.orig/langtools/mak classname="CompilePropertiesTask" classpath="${build.toolclasses.dir}/"/> diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile ---- openjdk-ecj.orig/langtools/make/Makefile 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/langtools/make/Makefile 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/langtools/make/Makefile 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/langtools/make/Makefile 2009-04-16 18:21:48.000000000 +0100 @@ -112,7 +112,7 @@ ifdef ALT_BOOTDIR @@ -836,8 +841,8 @@ diff -Nru openjdk-ecj.orig/langtools/mak ifdef ALT_OUTPUTDIR diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk ---- openjdk-ecj.orig/make/jdk-rules.gmk 2009-02-10 18:12:00.000000000 +0000 -+++ openjdk-ecj/make/jdk-rules.gmk 2009-02-10 19:24:54.000000000 +0000 +--- openjdk-ecj.orig/make/jdk-rules.gmk 2009-04-16 15:16:30.000000000 +0100 ++++ openjdk-ecj/make/jdk-rules.gmk 2009-04-16 18:21:48.000000000 +0100 @@ -58,7 +58,7 @@ endif diff -r bf7c34ac17a5 -r 1fe13f115ab0 patches/icedtea-alpha-fixes.patch --- a/patches/icedtea-alpha-fixes.patch Fri Mar 20 11:57:47 2009 +0000 +++ b/patches/icedtea-alpha-fixes.patch Wed Apr 22 16:53:21 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/corba/make/common diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk ---- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-09-01 01:43:43.000000000 +0100 -+++ openjdk/corba/make/common/Defs-linux.gmk 2008-09-01 01:45:15.000000000 +0100 +--- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-04-15 15:39:27.000000000 +0100 ++++ openjdk/corba/make/common/Defs-linux.gmk 2009-04-15 16:07:19.000000000 +0100 @@ -176,7 +176,8 @@ CXXFLAGS_DBG += $(CC_LOWER_OPT) endif @@ -12,8 +12,8 @@ diff -Nru openjdk.orig/corba/make/common ifeq ($(ARCH_DATA_MODEL), 64) diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile ---- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2008-09-01 01:43:43.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/linux/Makefile 2008-09-01 01:45:15.000000000 +0100 +--- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2009-04-15 15:39:27.000000000 +0100 ++++ openjdk/hotspot/agent/src/os/linux/Makefile 2009-04-15 16:07:19.000000000 +0100 @@ -40,7 +40,7 @@ LIBS = -lthread_db @@ -33,9 +33,9 @@ diff -Nru openjdk.orig/hotspot/agent/src test: test.o $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) From ahughes at redhat.com Fri May 8 07:51:43 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 08 May 2009 14:51:43 +0000 Subject: changeset in /hg/icedtea: Build from tarballs of the IcedTea for... Message-ID: changeset ac22a2f56293 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ac22a2f56293 description: Build from tarballs of the IcedTea forest by default. 2009-05-07 Andrew John Hughes * Makefile.am: Support downloading and extracting from the forest repositories rather than one megatarball. diffstat: 2 files changed, 186 insertions(+), 36 deletions(-) ChangeLog | 6 + Makefile.am | 216 +++++++++++++++++++++++++++++++++++++++++++++++++---------- diffs (293 lines): diff -r 1fe13f115ab0 -r ac22a2f56293 ChangeLog --- a/ChangeLog Wed Apr 22 16:53:21 2009 +0100 +++ b/ChangeLog Thu May 07 14:15:56 2009 +0100 @@ -1,3 +1,9 @@ 2009-04-16 Andrew John Hughes + + * Makefile.am: + Support downloading and extracting from + the forest repositories rather than one megatarball. + 2009-04-16 Andrew John Hughes * patches/icedtea-java2d-dasher.patch, diff -r 1fe13f115ab0 -r ac22a2f56293 Makefile.am --- a/Makefile.am Wed Apr 22 16:53:21 2009 +0100 +++ b/Makefile.am Thu May 07 14:15:56 2009 +0100 @@ -1,4 +1,18 @@ OPENJDK_MD5SUM = a451251ebdd9a219b164293 -OPENJDK_MD5SUM = a451251ebdd9a219b16429369fa72e2a +OPENJDK_CHANGESET = 4264c2fe6649 +CORBA_CHANGESET = 61116c9789b9 +JAXP_CHANGESET = ae890d80d5df +JAXWS_CHANGESET = 41a66a42791b +JDK_CHANGESET = 111759f6793e +LANGTOOLS_CHANGESET = 2c0076945b1a +HOTSPOT_CHANGESET = ce2272390558 + +OPENJDK_MD5SUM = 5a8079dc55a46ae3750fdf7ca0ac0c7e +CORBA_MD5SUM = f4cad920654b2e26cb10096ef36a6fbd +JAXP_MD5SUM = 3356a4449fffd71c19aaae98deb04e88 +JAXWS_MD5SUM = c45f0c75b7c2a0091f697e0c83f85e3f +JDK_MD5SUM = 23b1790a8ca14c91cbed0b5843027d54 +LANGTOOLS_MD5SUM = 51735120c48db8ccaf11296ab5b73c5e +HOTSPOT_MD5SUM = 94f6a0f2ccf1b79b0950f6f74a73214e CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa @@ -1505,7 +1519,7 @@ dist-openjdk: stamps/extract-cacao.stamp # Download OpenJDK sources. -HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/ +OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/ @@ -1514,22 +1528,48 @@ BSD_HG_URL = http://hg.openjdk.java.net/ BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/ -OPENJDK_URL = http://hg.openjdk.java.net/icedtea/jdk7/archive/ +OPENJDK_URL = http://hg.openjdk.java.net/icedtea/jdk7 +CORBA_URL = http://hg.openjdk.java.net/icedtea/jdk7/corba +JAXP_URL = http://hg.openjdk.java.net/icedtea/jdk7/jaxp +JAXWS_URL = http://hg.openjdk.java.net/icedtea/jdk7/jaxws +JDK_URL = http://hg.openjdk.java.net/icedtea/jdk7/jdk +LANGTOOLS_URL = http://hg.openjdk.java.net/icedtea/jdk7/langtools +HOTSPOT_URL = http://hg.openjdk.java.net/icedtea/jdk7/hotspot if USE_ALT_OPENJDK_SRC_ZIP OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) else 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 - OPENJDK_SRC_ZIP = tip.tar.gz + OPENJDK_SRC_ZIP = openjdk.tar.gz + CORBA_SRC_ZIP = corba.tar.gz + JAXP_SRC_ZIP = jaxp.tar.gz + JAXWS_SRC_ZIP = jaxws.tar.gz + JDK_SRC_ZIP = jdk.tar.gz + LANGTOOLS_SRC_ZIP = langtools.tar.gz + HOTSPOT_SRC_ZIP = hotspot.tar.gz endif endif if USE_ALT_HOTSPOT_SRC_ZIP HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP) +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 - HOTSPOT_SRC_ZIP = hotspot.tar.gz + HS_MD5SUM = $(HOTSPOT_MD5SUM) + HS_CHANGESET = $(HOTSPOT_CHANGESET) + HS_URL = $(HOTSPOT_URL) endif CACAO_BASE_URL = http://www.complang.tuwien.ac.at @@ -1574,31 +1614,70 @@ else then \ mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ fi ; \ - $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \ - fi -endif -endif -endif -endif -endif -endif -endif -endif -if WITH_ALT_HSBUILD - hotspot_md5sum="`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) \ - $(abs_top_srcdir)/hotspot.map`" ; \ - if ! echo "$${hotspot_md5sum} $(HOTSPOT_SRC_ZIP)" \ + $(WGET) $(OPENJDK_URL)/archive/$(OPENJDK_CHANGESET).tar.gz -O $(OPENJDK_SRC_ZIP); \ + fi ; \ + if ! echo "$(CORBA_MD5SUM) $(CORBA_SRC_ZIP)" \ + | $(MD5SUM) --check ; \ + then \ + if [ $(CORBA_SRC_ZIP) ] ; \ + then \ + mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(CORBA_URL)/archive/$(CORBA_CHANGESET).tar.gz -O $(CORBA_SRC_ZIP); \ + fi ; \ + if ! echo "$(JAXP_MD5SUM) $(JAXP_SRC_ZIP)" \ + | $(MD5SUM) --check ; \ + then \ + if [ $(JAXP_SRC_ZIP) ] ; \ + then \ + mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(JAXP_URL)/archive/$(JAXP_CHANGESET).tar.gz -O $(JAXP_SRC_ZIP); \ + fi ; \ + if ! echo "$(JAXWS_MD5SUM) $(JAXWS_SRC_ZIP)" \ + | $(MD5SUM) --check ; \ + then \ + if [ $(JAXWS_SRC_ZIP) ] ; \ + then \ + mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(JAXWS_URL)/archive/$(JAXWS_CHANGESET).tar.gz -O $(JAXWS_SRC_ZIP); \ + fi ; \ + if ! echo "$(JDK_MD5SUM) $(JDK_SRC_ZIP)" \ + | $(MD5SUM) --check ; \ + then \ + if [ $(JDK_SRC_ZIP) ] ; \ + then \ + mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(JDK_URL)/archive/$(JDK_CHANGESET).tar.gz -O $(JDK_SRC_ZIP); \ + fi ; \ + if ! echo "$(LANGTOOLS_MD5SUM) $(LANGTOOLS_SRC_ZIP)" \ + | $(MD5SUM) --check ; \ + then \ + if [ $(LANGTOOLS_SRC_ZIP) ] ; \ + then \ + mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \ + fi ; +endif +endif +endif +endif +endif +endif +endif +endif + if ! echo "$(HS_MD5SUM) $(HOTSPOT_SRC_ZIP)" \ | $(MD5SUM) --check ; \ then \ if [ $(HOTSPOT_SRC_ZIP) ] ; \ then \ mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \ fi ; \ - changeset="`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \ - $(abs_top_srcdir)/hotspot.map`" ; \ - $(WGET) $(HOTSPOT_URL)$${changeset}.tar.gz -O $(HOTSPOT_SRC_ZIP) ; \ - fi -endif + $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \ + fi if WITH_CACAO if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP @@ -1872,6 +1951,7 @@ else *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ esac; \ + mv jdk7-$(OPENJDK_CHANGESET) openjdk ; \ if test "x${HSBUILD}" != "xdefault"; then \ rm -rf openjdk/hotspot ; \ fi ; \ @@ -1880,21 +1960,85 @@ else false; \ fi; \ fi; -endif -if WITH_ALT_HSBUILD - if test -e ${HOTSPOT_SRC_ZIP} ; \ - then \ - if ! test -d openjdk/hotspot ; \ + if [ ! -z $(CORBA_SRC_ZIP) ] ; then \ + if test -e ${CORBA_SRC_ZIP} ; \ then \ - case "$(HOTSPOT_SRC_ZIP)" in \ - *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \ - *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \ - esac; \ - mv hotspot-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \ - $(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \ + if ! test -d openjdk/corba ; \ + then \ + case "$(CORBA_SRC_ZIP)" in \ + *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \ + *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \ + esac; \ + mv corba-$(CORBA_CHANGESET) openjdk/corba ; \ + fi ; \ fi ; \ fi -endif + if [ ! -z $(JAXP_SRC_ZIP) ] ; then \ + if test -e ${JAXP_SRC_ZIP} ; \ + then \ + if ! test -d openjdk/jaxp ; \ + then \ + case "$(JAXP_SRC_ZIP)" in \ + *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \ + *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \ + esac; \ + mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \ + fi ; \ + fi ; \ + fi + if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \ + if test -e ${JAXWS_SRC_ZIP} ; \ + then \ + if ! test -d openjdk/jaxws ; \ + then \ + case "$(JAXWS_SRC_ZIP)" in \ + *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \ + *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \ + esac; \ + mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \ + fi ; \ + fi ; \ + fi + if [ ! -z $(JDK_SRC_ZIP) ] ; then \ + if test -e ${JDK_SRC_ZIP} ; \ + then \ + if ! test -d openjdk/jdk ; \ + then \ + case "$(JDK_SRC_ZIP)" in \ + *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \ + *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \ + esac; \ + mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \ + fi ; \ + fi ; \ + fi + if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \ + if test -e ${LANGTOOLS_SRC_ZIP} ; \ + then \ + if ! test -d openjdk/hotspot ; \ + then \ + case "$(LANGTOOLS_SRC_ZIP)" in \ + *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \ + *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \ + esac; \ + mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \ + fi ; \ + fi ; \ + fi +endif + if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \ + if test -e ${HOTSPOT_SRC_ZIP} ; \ + then \ + if ! test -d openjdk/hotspot ; \ + then \ + case "$(HOTSPOT_SRC_ZIP)" in \ + *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \ + *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \ + esac; \ + mv hotspot-$(HS_CHANGESET) openjdk/hotspot ; \ + fi ; \ + fi ; \ + fi chmod -R ug+w openjdk sh $(srcdir)/fsg.sh ; find openjdk -name '*.java' \ From ahughes at redhat.com Fri May 8 07:51:44 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 08 May 2009 14:51:44 +0000 Subject: changeset in /hg/icedtea: Support zips for the other OpenJDK rep... Message-ID: changeset 21921f352706 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=21921f352706 description: Support zips for the other OpenJDK repositories (CORBA, JAXP, JAXWS, JDK and langtools). 2009-05-07 Andrew John Hughes * Makefile.am: Support replacing the zips for CORBA, JAXP, JAXWS, JDK and langtools. * acinclude.m4: (WITH_CORBA_SRC_ZIP): Added. (WITH_JAXP_SRC_ZIP): Likewise. (WITH_JAXWS_SRC_ZIP): Likewise. (WITH_JDK_SRC_ZIP): Likewise. (WITH_LANGTOOLS_SRC_ZIP): Likewise. * configure.ac: Include new macros. diffstat: 4 files changed, 124 insertions(+) ChangeLog | 14 +++++++++ Makefile.am | 20 +++++++++++++ acinclude.m4 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 5 +++ diffs (161 lines): diff -r ac22a2f56293 -r 21921f352706 ChangeLog --- a/ChangeLog Thu May 07 14:15:56 2009 +0100 +++ b/ChangeLog Thu May 07 16:58:42 2009 +0100 @@ -1,3 +1,17 @@ 2009-05-07 Andrew John Hughes + + * Makefile.am: + Support replacing the zips for CORBA, + JAXP, JAXWS, JDK and langtools. + * acinclude.m4: + (WITH_CORBA_SRC_ZIP): Added. + (WITH_JAXP_SRC_ZIP): Likewise. + (WITH_JAXWS_SRC_ZIP): Likewise. + (WITH_JDK_SRC_ZIP): Likewise. + (WITH_LANGTOOLS_SRC_ZIP): Likewise. + * configure.ac: + Include new macros. + 2009-05-07 Andrew John Hughes * Makefile.am: diff -r ac22a2f56293 -r 21921f352706 Makefile.am --- a/Makefile.am Thu May 07 14:15:56 2009 +0100 +++ b/Makefile.am Thu May 07 16:58:42 2009 +0100 @@ -1572,6 +1572,26 @@ else HS_URL = $(HOTSPOT_URL) endif +if USE_ALT_CORBA_SRC_ZIP + CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP) +endif + +if USE_ALT_JAXP_SRC_ZIP + JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP) +endif + +if USE_ALT_JAXWS_SRC_ZIP + JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP) +endif + +if USE_ALT_JDK_SRC_ZIP + JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP) +endif + +if USE_ALT_LANGTOOLS_SRC_ZIP + LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP) +endif + CACAO_BASE_URL = http://www.complang.tuwien.ac.at CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ diff -r ac22a2f56293 -r 21921f352706 acinclude.m4 --- a/acinclude.m4 Thu May 07 14:15:56 2009 +0100 +++ b/acinclude.m4 Thu May 07 16:58:42 2009 +0100 @@ -1031,6 +1031,91 @@ AC_DEFUN([WITH_HOTSPOT_SRC_ZIP], AC_SUBST(ALT_HOTSPOT_SRC_ZIP) ]) +AC_DEFUN([WITH_CORBA_SRC_ZIP], +[ + AC_MSG_CHECKING(for a CORBA source zip) + AC_ARG_WITH([corba-src-zip], + [AS_HELP_STRING(--with-corba-src-zip,specify the location of the corba source zip)], + [ + ALT_CORBA_SRC_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_CORBA_SRC_ZIP, test x = x) + ], + [ + ALT_CORBA_SRC_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_CORBA_SRC_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_CORBA_SRC_ZIP}) + AC_SUBST(ALT_CORBA_SRC_ZIP) +]) + +AC_DEFUN([WITH_JAXP_SRC_ZIP], +[ + AC_MSG_CHECKING(for a JAXP source zip) + AC_ARG_WITH([jaxp-src-zip], + [AS_HELP_STRING(--with-jaxp-src-zip,specify the location of the jaxp source zip)], + [ + ALT_JAXP_SRC_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_JAXP_SRC_ZIP, test x = x) + ], + [ + ALT_JAXP_SRC_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_JAXP_SRC_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_JAXP_SRC_ZIP}) + AC_SUBST(ALT_JAXP_SRC_ZIP) +]) + +AC_DEFUN([WITH_JAXWS_SRC_ZIP], +[ + AC_MSG_CHECKING(for a JAXWS source zip) + AC_ARG_WITH([jaxws-src-zip], + [AS_HELP_STRING(--with-jaxws-src-zip,specify the location of the jaxws source zip)], + [ + ALT_JAXWS_SRC_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_JAXWS_SRC_ZIP, test x = x) + ], + [ + ALT_JAXWS_SRC_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_JAXWS_SRC_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_JAXWS_SRC_ZIP}) + AC_SUBST(ALT_JAXWS_SRC_ZIP) +]) + +AC_DEFUN([WITH_JDK_SRC_ZIP], +[ + AC_MSG_CHECKING(for a JDK source zip) + AC_ARG_WITH([jdk-src-zip], + [AS_HELP_STRING(--with-jdk-src-zip,specify the location of the jdk source zip)], + [ + ALT_JDK_SRC_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_JDK_SRC_ZIP, test x = x) + ], + [ + ALT_JDK_SRC_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_JDK_SRC_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_JDK_SRC_ZIP}) + AC_SUBST(ALT_JDK_SRC_ZIP) +]) + +AC_DEFUN([WITH_LANGTOOLS_SRC_ZIP], +[ + AC_MSG_CHECKING(for a langtools source zip) + AC_ARG_WITH([langtools-src-zip], + [AS_HELP_STRING(--with-langtools-src-zip,specify the location of the langtools source zip)], + [ + ALT_LANGTOOLS_SRC_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_LANGTOOLS_SRC_ZIP, test x = x) + ], + [ + ALT_LANGTOOLS_SRC_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_LANGTOOLS_SRC_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_LANGTOOLS_SRC_ZIP}) + AC_SUBST(ALT_LANGTOOLS_SRC_ZIP) +]) + AC_DEFUN([ENABLE_HG], [ AC_MSG_CHECKING(whether to retrieve the source code from Mercurial) diff -r ac22a2f56293 -r 21921f352706 configure.ac --- a/configure.ac Thu May 07 14:15:56 2009 +0100 +++ b/configure.ac Thu May 07 16:58:42 2009 +0100 @@ -273,6 +273,11 @@ FIND_RHINO_JAR FIND_RHINO_JAR WITH_OPENJDK_SRC_ZIP WITH_HOTSPOT_SRC_ZIP +WITH_CORBA_SRC_ZIP +WITH_JAXP_SRC_ZIP +WITH_JAXWS_SRC_ZIP +WITH_JDK_SRC_ZIP +WITH_LANGTOOLS_SRC_ZIP WITH_OPENJDK_SRC_DIR WITH_ALT_JAR_BINARY AC_CHECK_ENABLE_CACAO From gnu_andrew at member.fsf.org Fri May 8 08:00:31 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 16:00:31 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <20090508144739.GH3190@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> Message-ID: <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> 2009/5/8 Gary Benson : > Andrew John Hughes wrote: >> 2009/5/8 Gary Benson : >> > Gary Benson wrote: >> > > This patch makes the Zero and Shark patches be applied to >> > > all builds, not just Zero and Shark ones. ?Ok to commit? >> > >> > *This* patch. ?The one thing I don't like about mutt is the >> > way it makes you forget attachments... >> >> Very cool. ?Please commit. >> >> Are all the Zero/Shark patches in this change SCAed? > > If doko and xranby are both covered then... probably. > For the purposes of disambiguation, can you tell me exactly the > patches you plan to push, and I'll confirm them individually. > Oh, the last time we had this discussion I thought you were pretty much the sole copyright holder. In that case, I'll confirm each patch as I intend to push it. I think doko is still without an SCA, not such with xranby. I'd like to get them in the forest in 7 so I don't have to keep doing zero and shark builds just to check for patch conflicts. Either way, I have to merge the changes in 6 across, and doing it in the forest seems easier than on a patch-by-patch basis. >> If so, I'd like to just push them (or rather the 7 equivalents) >> into the IcedTea forest for 7. > > What is the process for going from there to the OpenJDK forest? > Same as aph outlined. Having the commits in the IcedTea forest would mean that you could roll the patches/webrev from the changeset(s) there, and we can do 'raw' OpenJDK builds of Zero/Shark. HotSpot in the IcedTea forest will be the same as HotSpot in the master jdk7 tree as soon as I bump to b57. Of course, if you want to go straight for 6, you need to apply the patches against the 6 forest instead, but that's probably not possible until the version of HotSpot in 6 is updated. > Cheers, > Gary > > -- > http://gbenson.net/ > -- 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 langel at redhat.com Fri May 8 08:01:39 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 08 May 2009 11:01:39 -0400 Subject: Bug 100050 - lcms 1.18 update breaks ICC_ProfileRGB Tests In-Reply-To: <4A041963.2030203@redhat.com> References: <4A041963.2030203@redhat.com> Message-ID: <4A044953.5090708@redhat.com> Andrew Haley wrote: > Colour management is broken at the moment because the import of the > latest OpenJDK 6 contains a new version of lcms that is buggy. > > I've written a patch to fix this, and Sun are looking at it. In the > meantime I propose to patch IcedTea as a temporary workaround. > > OK? > Looks good to me. Lillian > Andrew. > > > > --- LCMS.c~ 2009-04-24 08:34:31.000000000 +0100 > +++ LCMS.c 2009-05-07 19:11:37.000000000 +0100 > @@ -610,14 +610,19 @@ > return FALSE; > } > > - if (!Icc->Grow(Icc, delta)) { > - free(ptr); > - if(isNew) { > - Icc->TagCount--; > - } > - J2dRlsTraceLn(J2D_TRACE_ERROR, > - "_cmsModifyTagData: Icc->Grow() == FALSE"); > - return FALSE; > + /* We change the size of Icc here only if we know it'll actually > + * grow: if Icc is about to shrink we must wait until we've read > + * the previous data. */ > + if (delta > 0) { > + if (!Icc->Grow(Icc, delta)) { > + free(ptr); > + if(isNew) { > + Icc->TagCount--; > + } > + J2dRlsTraceLn(J2D_TRACE_ERROR, > + "_cmsModifyTagData: Icc->Grow() == FALSE"); > + return FALSE; > + } > } > > /* Compute size of tag data before/after the modified tag */ > @@ -680,6 +685,18 @@ > temp = TransportValue32(profileSize); > Icc->Write(Icc, sizeof(icUInt32Number), &temp); > > + /* Shrink Icc, if needed. */ > + if (delta < 0) { > + if (!Icc->Grow(Icc, delta)) { > + free(ptr); > + if(isNew) { > + Icc->TagCount--; > + } > + J2dRlsTraceLn(J2D_TRACE_ERROR, > + "_cmsModifyTagData: Icc->Grow() == FALSE"); > + return FALSE; > + } > + } > > /* Adjust tag offsets: if the tag is new, we must account > for the new tag table entry; otherwise, only those tags after > From gbenson at redhat.com Fri May 8 08:06:45 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 16:06:45 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> Message-ID: <20090508150645.GI3190@redhat.com> Andrew John Hughes wrote: > 2009/5/8 Gary Benson : > > > If so, I'd like to just push them (or rather the 7 equivalents) > > > into the IcedTea forest for 7. > > > > What is the process for going from there to the OpenJDK forest? > > Same as aph outlined. Having the commits in the IcedTea forest > would mean that you could roll the patches/webrev from the > changeset(s) there, and we can do 'raw' OpenJDK builds of > Zero/Shark. HotSpot in the IcedTea forest will be the same as > HotSpot in the master jdk7 tree as soon as I bump to b57. That's cool. I was a little concerned that they might disappear into a mass of changes, but I guess we can pull them out more or less painlessly so long as each patch is an individual commit. Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Fri May 8 08:10:50 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 16:10:50 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <20090508150645.GI3190@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> <20090508150645.GI3190@redhat.com> Message-ID: <4A044B7A.3030504@redhat.com> Gary Benson wrote: > Andrew John Hughes wrote: >> 2009/5/8 Gary Benson : >>>> If so, I'd like to just push them (or rather the 7 equivalents) >>>> into the IcedTea forest for 7. >>> What is the process for going from there to the OpenJDK forest? >> Same as aph outlined. Having the commits in the IcedTea forest >> would mean that you could roll the patches/webrev from the >> changeset(s) there, and we can do 'raw' OpenJDK builds of >> Zero/Shark. HotSpot in the IcedTea forest will be the same as >> HotSpot in the master jdk7 tree as soon as I bump to b57. > > That's cool. I was a little concerned that they might disappear > into a mass of changes, but I guess we can pull them out more or > less painlessly so long as each patch is an individual commit. For what it worth: there may be little practical benefit in getting Zero into OpenJDK 6. By the time we get it all in, OpenJDK 6 is going to be in maintenance-only mode, not quite EOL but getting there. I'd advise you to concentrate on OpenJDK 7. Andrew. From gnu_andrew at member.fsf.org Fri May 8 08:33:36 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 16:33:36 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <20090508150645.GI3190@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> <20090508150645.GI3190@redhat.com> Message-ID: <17c6771e0905080833u76f20182q1d4840701de23de5@mail.gmail.com> 2009/5/8 Gary Benson : > Andrew John Hughes wrote: >> 2009/5/8 Gary Benson : >> > > If so, I'd like to just push them (or rather the 7 equivalents) >> > > into the IcedTea forest for 7. >> > >> > What is the process for going from there to the OpenJDK forest? >> >> Same as aph outlined. ?Having the commits in the IcedTea forest >> would mean that you could roll the patches/webrev from the >> changeset(s) there, and we can do 'raw' OpenJDK builds of >> Zero/Shark. ?HotSpot in the IcedTea forest will be the same as >> HotSpot in the master jdk7 tree as soon as I bump to b57. > > That's cool. ?I was a little concerned that they might disappear > into a mass of changes, but I guess we can pull them out more or > less painlessly so long as each patch is an individual commit. > A patch-->commit relationship was the intention. From such a changeset, you can do hg diff -g to get a patch to submit upstream, and the webrev script also requires a changeset rather than a patch. > Cheers, > Gary > > -- > http://gbenson.net/ > -- 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 Fri May 8 08:36:49 2009 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 08 May 2009 17:36:49 +0200 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> Message-ID: <4A045191.70205@ubuntu.com> Andrew John Hughes schrieb: > 2009/5/8 Gary Benson : >> Andrew John Hughes wrote: >>> 2009/5/8 Gary Benson : >>>> Gary Benson wrote: >>>>> This patch makes the Zero and Shark patches be applied to >>>>> all builds, not just Zero and Shark ones. Ok to commit? >>>> *This* patch. The one thing I don't like about mutt is the >>>> way it makes you forget attachments... >>> Very cool. Please commit. >>> >>> Are all the Zero/Shark patches in this change SCAed? >> If doko and xranby are both covered then... probably. >> For the purposes of disambiguation, can you tell me exactly the >> patches you plan to push, and I'll confirm them individually. >> > > Oh, the last time we had this discussion I thought you were pretty > much the sole copyright holder. > > In that case, I'll confirm each patch as I intend to push it. I think > doko is still without an SCA, not such with xranby. No, that's wrong. And I confirm that it is fine to contribute all the patches (written or extended by me) currently in the IcedTea repository under the SCA. Matthias From aph at redhat.com Fri May 8 08:40:14 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 16:40:14 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <4A044B7A.3030504@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> <20090508150645.GI3190@redhat.com> <4A044B7A.3030504@redhat.com> Message-ID: <4A04525E.5020107@redhat.com> Andrew Haley wrote: > For what it worth: there may be little practical benefit in getting > Zero into OpenJDK 6. By the time we get it all in, OpenJDK 6 is going > to be in maintenance-only mode, not quite EOL but getting there. I'd > advise you to concentrate on OpenJDK 7. I just realized this is silly: once Zero is in 7 it'll turn up in 6 after a little while anyway. Andrew. From gbenson at redhat.com Fri May 8 08:53:29 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 8 May 2009 16:53:29 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <4A04525E.5020107@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> <20090508150645.GI3190@redhat.com> <4A044B7A.3030504@redhat.com> <4A04525E.5020107@redhat.com> Message-ID: <20090508155328.GJ3190@redhat.com> Andrew Haley wrote: > Andrew Haley wrote: > > For what it worth: there may be little practical benefit in > > getting Zero into OpenJDK 6. By the time we get it all in, > > OpenJDK 6 is going to be in maintenance-only mode, not quite EOL > > but getting there. I'd advise you to concentrate on OpenJDK 7. > > I just realized this is silly: once Zero is in 7 it'll turn up in > 6 after a little while anyway. Ok, but for the bugs and things in the class library, do I bother pushing them to 6 or just 7 only? Cheers, Gary -- http://gbenson.net/ From gnu_andrew at member.fsf.org Fri May 8 09:05:32 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 17:05:32 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <20090508155328.GJ3190@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> <20090508150645.GI3190@redhat.com> <4A044B7A.3030504@redhat.com> <4A04525E.5020107@redhat.com> <20090508155328.GJ3190@redhat.com> Message-ID: <17c6771e0905080905g1851c2c1t9d96a2086ef543c9@mail.gmail.com> 2009/5/8 Gary Benson : > Andrew Haley wrote: >> Andrew Haley wrote: >> > For what it worth: there may be little practical benefit in >> > getting Zero into OpenJDK 6. ?By the time we get it all in, >> > OpenJDK 6 is going to be in maintenance-only mode, not quite EOL >> > but getting there. ?I'd advise you to concentrate on OpenJDK 7. >> >> I just realized this is silly: once Zero is in 7 it'll turn up in >> 6 after a little while anyway. > > Ok, but for the bugs and things in the class library, do I bother > pushing them to 6 or just 7 only? > > Cheers, > Gary > > -- > http://gbenson.net/ > The common way seems to be to do the main work with 7, then Joe can give the green light for a backport of the changeset to 6 if appropriate. There are more eyes on 7 so seems best to go there first. -- 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 aph at redhat.com Fri May 8 09:08:48 2009 From: aph at redhat.com (Andrew Haley) Date: Fri, 08 May 2009 17:08:48 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <20090508155328.GJ3190@redhat.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> <20090508150645.GI3190@redhat.com> <4A044B7A.3030504@redhat.com> <4A04525E.5020107@redhat.com> <20090508155328.GJ3190@redhat.com> Message-ID: <4A045910.6050701@redhat.com> Gary Benson wrote: > Andrew Haley wrote: >> Andrew Haley wrote: >>> For what it worth: there may be little practical benefit in >>> getting Zero into OpenJDK 6. By the time we get it all in, >>> OpenJDK 6 is going to be in maintenance-only mode, not quite EOL >>> but getting there. I'd advise you to concentrate on OpenJDK 7. >> I just realized this is silly: once Zero is in 7 it'll turn up in >> 6 after a little while anyway. > > Ok, but for the bugs and things in the class library, do I bother > pushing them to 6 or just 7 only? I don't have any really strong opinions about those, but I suppose it'll be tidier to push them -- unless there are problems getting approval. Andrew. From gnu_andrew at member.fsf.org Fri May 8 09:24:48 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 8 May 2009 17:24:48 +0100 Subject: [PATCH] Always apply Zero and Shark patches In-Reply-To: <4A045191.70205@ubuntu.com> References: <20090508131603.GD3190@redhat.com> <20090508131640.GE3190@redhat.com> <17c6771e0905080739s3cb76e82g762a5cbdd374677b@mail.gmail.com> <20090508144739.GH3190@redhat.com> <17c6771e0905080800m7796cea8i15a8b44b357673a1@mail.gmail.com> <4A045191.70205@ubuntu.com> Message-ID: <17c6771e0905080924w3c67a8cepe3b3c4b9fc419b15@mail.gmail.com> 2009/5/8 Matthias Klose : > Andrew John Hughes schrieb: >> 2009/5/8 Gary Benson : >>> Andrew John Hughes wrote: >>>> 2009/5/8 Gary Benson : >>>>> Gary Benson wrote: >>>>>> This patch makes the Zero and Shark patches be applied to >>>>>> all builds, not just Zero and Shark ones. ?Ok to commit? >>>>> *This* patch. ?The one thing I don't like about mutt is the >>>>> way it makes you forget attachments... >>>> Very cool. ?Please commit. >>>> >>>> Are all the Zero/Shark patches in this change SCAed? >>> If doko and xranby are both covered then... probably. >>> For the purposes of disambiguation, can you tell me exactly the >>> patches you plan to push, and I'll confirm them individually. >>> >> >> Oh, the last time we had this discussion I thought you were pretty >> much the sole copyright holder. >> >> In that case, I'll confirm each patch as I intend to push it. ?I think >> doko is still without an SCA, not such with xranby. > > No, that's wrong. And I confirm that it is fine to contribute all the patches > (written or extended by me) currently in the IcedTea repository under the SCA. > > ?Matthias > > Ok, that's news to me. Thanks a lot, much appreciated. -- 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 martinrb at google.com Fri May 8 13:32:14 2009 From: martinrb at google.com (Martin Buchholz) Date: Fri, 8 May 2009 13:32:14 -0700 Subject: quilt for patch management? In-Reply-To: <20090508144314.GG3190@redhat.com> References: <4A043697.9000501@gmx.net> <4A043B4B.7080606@redhat.com> <4A043C64.9070904@gmx.net> <17c6771e0905080734o27d058c8pa835f09f6044367@mail.gmail.com> <20090508144314.GG3190@redhat.com> Message-ID: <1ccfd1c10905081332v6a2646f3ob01ab18a045784@mail.gmail.com> Mercurial has its own quilt-like system, "mq - mercurial queues", which I use for my own patch management. I have wondered how icedtea manages patches. If I was going to hack on icedtea, the first thing I would try is to import the icedtea patches into mq. The biggest benefit of mq is the improved workflow: hg qgoto PATCH hack...test... hg qrefresh The directory containing the patches would itself be under source control. (IcedTea already does this) Martin On Fri, May 8, 2009 at 07:43, Gary Benson wrote: > Andrew John Hughes wrote: >> The time spent switching to quilt would be better spent getting >> patches upstream. > > Definitely. > > Cheers, > Gary > > -- > http://gbenson.net/ > From gbenson at redhat.com Mon May 11 05:58:40 2009 From: gbenson at redhat.com (Gary Benson) Date: Mon, 11 May 2009 13:58:40 +0100 Subject: Authors for JDK6 patches on IcedTea wiki Message-ID: <20090511125840.GC3204@redhat.com> Hi all, I'm about to go through the list of IcedTea JDK6 patches (http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches) and annotate the ones which I'm responsible for, but I have one question first. For the authors field, is it necessary to list everyone who's touched a file? A few of mine have been fixed to apply to new builds, and I wondered if I need to list everyone who's done that or not. Cheers, Gary -- http://gbenson.net/ From langel at redhat.com Mon May 11 07:27:54 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 11 May 2009 10:27:54 -0400 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905080544h4f3e8ed2te55a3dbda0d33e43@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <4A0427F4.8050204@redhat.com> <17c6771e0905080544h4f3e8ed2te55a3dbda0d33e43@mail.gmail.com> Message-ID: <4A0835EA.6020604@redhat.com> Andrew John Hughes wrote: > 2009/5/8 Lillian Angel : > >> Andrew John Hughes wrote: >> >>> Dear all, >>> >>> Sun plan to release a JavaOne preview of JDK7 on May 21st >>> (http://openjdk.java.net/projects/jdk7/milestones/). >>> We'd like to do a corresponding release of IcedTea7 (1.10) around the >>> same time, that can then be packaged in any distros that wish to ship >>> such a preview. >>> This will involve: >>> >>> * Updating IcedTea7 to support the latest build drop from Sun >>> (currently b57, which is the last non-stabilisation release). >>> IcedTea7 is now based on the IcedTea forest >>> (http://hg.openjdk.java.net/icedtea/jdk7) so this is a two stage >>> process involving pulling the latest changes into the forest and then >>> ensuring this builds with IcedTea7. >>> * Updating Shark/Zero in IcedTea7; ideally we would put this directly >>> into the forest, but I don't know how ready Gary is for this step. >>> * Updating the plugin/jaxws support; again it would be nice to have it >>> in the forest, but there probably isn't enough time. >>> * Any additional features from IcedTea6; we're not doing mass merges >>> any more because the two have diverged so far from each other that >>> this has become impractical (probably lots of conflicts and build >>> breakages for a few usable changes). ? doko and mjw have already >>> requested that --with-additional-vms and systemtap support be added. >>> >>> Any help would be much appreciated. ? Integration of Shark/Zero and the >>> plugin can be done fairly independently so if someone wants to work on >>> this, feel free. >>> >>> >> Please add the visualvm fixes from IcedTea6 as well. >> >> >> Thanks! >> Lillian >> >> >> > > Ah yeah, knew I'd forgotten something! Thanks! Can you be sure that aph's latest lcms fix is included as well? Thanks, Lillian From langel at redhat.com Mon May 11 13:40:04 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 11 May 2009 20:40:04 +0000 Subject: changeset in /hg/icedtea6: 2009-05-11 Lillian Angel changeset 4f5f97dc74fb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4f5f97dc74fb description: 2009-05-11 Lillian Angel * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java (getDefaultBaseDir): Set basedir for netx applications to ~/.netx, rather than asking. Now consistant with the plugin. * rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed. diffstat: 3 files changed, 9 insertions(+), 173 deletions(-) ChangeLog | 7 rt/net/sourceforge/jnlp/runtime/InstallDialog.java | 171 -------------------- rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 4 diffs (203 lines): diff -r b9c3b68cc5d7 -r 4f5f97dc74fb ChangeLog --- a/ChangeLog Fri May 08 15:49:54 2009 +0100 +++ b/ChangeLog Mon May 11 16:40:56 2009 -0400 @@ -1,3 +1,10 @@ 2009-05-08 Gary Benson + + * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java + (getDefaultBaseDir): Set basedir for netx applications to ~/.netx, + rather than asking. Now consistant with the plugin. + * rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed. + 2009-05-08 Gary Benson * Makefile.am: Always apply Zero and Shark patches. diff -r b9c3b68cc5d7 -r 4f5f97dc74fb rt/net/sourceforge/jnlp/runtime/InstallDialog.java --- a/rt/net/sourceforge/jnlp/runtime/InstallDialog.java Fri May 08 15:49:54 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -// Copyright (C) 2001-2003 Jon A. Maxwell (JAM) -// -// 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. - - -package net.sourceforge.jnlp.runtime; - -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.List; -import javax.swing.*; -import javax.jnlp.*; - -import net.sourceforge.jnlp.*; - -/** - * Prompt for an install location. - * - * @author Jon A. Maxwell (JAM) - initial author - * @version $Revision: 1.7 $ - */ -class InstallDialog extends Dialog implements ActionListener { - - private static String R(String key) { return JNLPRuntime.getMessage(key); } - - private ImageIcon background; - private TextField installField = new TextField(); - private Button ok = new Button(R("ButOk")); - private Button cancel = new Button(R("ButCancel")); - private Button browse = new Button(R("ButBrowse")); - private boolean canceled = false; - - static Frame createFrame() { - Frame f = new Frame(); - f.setIconImage(JNLPRuntime.getWindowIcon()); - return f; - } - - InstallDialog() { - super(createFrame(), R("CChooseCache"), true); - - URL icon = (new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/install.png"); - - background = new ImageIcon(icon); - setLayout(new BorderLayout()); - setBackground(Color.white); - - String home = System.getProperty("java.io.tmpdir"); - installField.setText((new File(home)).toString()); - - ok.addActionListener(this); - cancel.addActionListener(this); - browse.addActionListener(this); - - Font f = new Font("SansSerif", Font.BOLD, 14); - - installField.setFont(f); - ok.setFont(f); - cancel.setFont(f); - browse.setFont(f); - - Panel top = new Panel(new GridLayout(2, 1, 0, 10)); - Label l1 = new Label(R("CChooseCacheInfo")); - Label l2 = new Label(R("CChooseCacheDir")+":"); - l1.setFont(f); - l2.setFont(f); - top.add(l1); - top.add(l2); - - Panel field = new Panel(new BorderLayout()); - field.add(top, BorderLayout.NORTH); - field.add(installField, BorderLayout.CENTER); - field.add(browse, BorderLayout.EAST); - - Panel grid = new Panel(new GridLayout(1, 2, 8, 8)); - grid.add(ok); - grid.add(cancel); - - Panel choice = new Panel(new FlowLayout(FlowLayout.CENTER, 4, 0)); - choice.add(grid); - - add(field, BorderLayout.NORTH); - add(new Panel(), BorderLayout.CENTER); - add(choice, BorderLayout.SOUTH); - } - - public Insets getInsets() { - Insets s = super.getInsets(); - return new Insets(s.top + 55, s.left + 7, s.bottom + 6, s.right + 4); - //return new Insets(s.top + 115, s.left + 7, s.bottom + 6, s.right + 4); - } - - public Dimension getPreferredSize() { - Dimension d = super.getPreferredSize(); - if (background == null) - return d; - - Insets in = super.getInsets(); - d.width = background.getIconWidth() + in.left + in.right; - d.height = Math.max(d.height + 8, background.getIconHeight() + 8 + in.top + in.bottom); - - return d; - } - - public void paint(Graphics g) { - - Insets sin = super.getInsets(); - g.drawImage(background.getImage(), sin.left, sin.top, this); - - } - - public void actionPerformed(ActionEvent evt) { - if (evt.getSource() == cancel) { - canceled = true; - dispose(); - } - if (evt.getSource() == ok) { - File f = new File(installField.getText()); - - try { - f.mkdirs(); - dispose(); - } - catch (Exception ex) { - JOptionPane.showMessageDialog(this, "Install directory cannot be created.", - "ERROR", JOptionPane.ERROR_MESSAGE); - } - } - if (evt.getSource() == browse) { - JFileChooser fc = new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - int r = fc.showOpenDialog(this); - if (r == JFileChooser.APPROVE_OPTION) - installField.setText(fc.getSelectedFile().toString()); - } - } - - - static File getInstallDir() { - InstallDialog id = new InstallDialog(); - - //id.setResizable(false); - id.pack(); - Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); - id.setLocation(screen.width/2-id.getWidth()/2, - screen.height/2-id.getHeight()/2); - id.setVisible(true); - - if (id.canceled) - return null; - - return new File(id.installField.getText()); - } - -} - diff -r b9c3b68cc5d7 -r 4f5f97dc74fb rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri May 08 15:49:54 2009 +0100 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon May 11 16:40:56 2009 -0400 @@ -280,8 +280,8 @@ public class JNLPRuntime { if (isHeadless()) return null; - File baseDir = InstallDialog.getInstallDir(); - if (baseDir == null) + File baseDir = new File(System.getProperty("user.home") + "/.netx/"); + if (!baseDir.mkdir()) return null; props.setProperty("basedir", baseDir.toString()); From langel at redhat.com Mon May 11 13:46:45 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 11 May 2009 20:46:45 +0000 Subject: changeset in /hg/icedtea6: 2009-05-11 Lillian Angel changeset cc658d9f4a64 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc658d9f4a64 description: 2009-05-11 Lillian Angel * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java (getDefaultBaseDir): Added null check. diffstat: 2 files changed, 6 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 2 +- diffs (24 lines): diff -r 4f5f97dc74fb -r cc658d9f4a64 ChangeLog --- a/ChangeLog Mon May 11 16:40:56 2009 -0400 +++ b/ChangeLog Mon May 11 16:47:39 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-11 Lillian Angel + + * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java + (getDefaultBaseDir): Added null check. + 2009-05-11 Lillian Angel * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java diff -r 4f5f97dc74fb -r cc658d9f4a64 rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon May 11 16:40:56 2009 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon May 11 16:47:39 2009 -0400 @@ -281,7 +281,7 @@ public class JNLPRuntime { return null; File baseDir = new File(System.getProperty("user.home") + "/.netx/"); - if (!baseDir.mkdir()) + if (baseDir == null || !baseDir.mkdir()) return null; props.setProperty("basedir", baseDir.toString()); From omajid at redhat.com Mon May 11 14:41:04 2009 From: omajid at redhat.com (Omair Majid) Date: Mon, 11 May 2009 17:41:04 -0400 Subject: RFC: Backport fix for Sun Bug 6539464 (Math.log() produces inconsistent results) Message-ID: <4A089B70.5040905@redhat.com> Hi, There is an issue in HS14 on x86_64 where calls to Math.log() can return different values for the same input value. This patch backports the fix [1] from OpenJDK7 (b56) to IcedTea6 Sun's bug entry: http://bugs.sun.com/view_bug.do?bug_id=6539464 Red Hat's bugzilla entry: https://bugzilla.redhat.com/show_bug.cgi?id=500077 ChangeLog: 2009-05-11 Omair Majid * patches/hotspot/default/icedtea-6539464.patch: New file. Backport fix for Sun Bug 6539464 from OpenJDK7 * Makefile.am (ICEDTEA_PATCHES): Apply the above. * HACKING: Document the above. Cheers, Omair [1] http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/819880572f09 -------------- next part -------------- A non-text attachment was scrubbed... Name: math-log.patch Type: text/x-patch Size: 5321 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090511/4f1a0b0b/math-log.patch From omajid at redhat.com Mon May 11 15:19:43 2009 From: omajid at redhat.com (Omair Majid) Date: Mon, 11 May 2009 18:19:43 -0400 Subject: RFC: Add splash screen support to netx Message-ID: <4A08A47F.6030206@redhat.com> Hi, The attached patch allows Netx in IcedTea6 to display splash screens while when launching a JNLP file. ChangeLog: 2009-05-11 Omair Majid * rt/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. This new class is responsible for displaying the splash screen. * rt/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a splash screen if specified in the JNLP file while loading the remote jars. * rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java (getListener): Reposition the frame at the bottom right corner of the screen. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: netx-jnlp.patch Type: text/x-patch Size: 5370 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090511/06e2b734/netx-jnlp.patch From aph at redhat.com Tue May 12 03:05:42 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 12 May 2009 11:05:42 +0100 Subject: RFC: Backport fix for Sun Bug 6539464 (Math.log() produces inconsistent results) In-Reply-To: <4A089B70.5040905@redhat.com> References: <4A089B70.5040905@redhat.com> Message-ID: <4A0949F6.6060905@redhat.com> Omair Majid wrote: > Hi, > > There is an issue in HS14 on x86_64 where calls to Math.log() can return > different values for the same input value. This patch backports the fix > [1] from OpenJDK7 (b56) to IcedTea6 > > Sun's bug entry: > http://bugs.sun.com/view_bug.do?bug_id=6539464 > Red Hat's bugzilla entry: > https://bugzilla.redhat.com/show_bug.cgi?id=500077 > > ChangeLog: > 2009-05-11 Omair Majid > > * patches/hotspot/default/icedtea-6539464.patch: New file. Backport > fix for Sun Bug 6539464 from OpenJDK7 > * Makefile.am (ICEDTEA_PATCHES): Apply the above. > * HACKING: Document the above. Well caught! Please push this upstream straight away. I imagine it'll be approved immediately. Andrew. From gnu_andrew at member.fsf.org Tue May 12 05:08:17 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 12 May 2009 13:08:17 +0100 Subject: RFC: Backport fix for Sun Bug 6539464 (Math.log() produces inconsistent results) In-Reply-To: <4A0949F6.6060905@redhat.com> References: <4A089B70.5040905@redhat.com> <4A0949F6.6060905@redhat.com> Message-ID: <17c6771e0905120508p48027029w977ac2c4ad8fa2aa@mail.gmail.com> 2009/5/12 Andrew Haley : > Omair Majid wrote: >> Hi, >> >> There is an issue in HS14 on x86_64 where calls to Math.log() can return >> different values for the same input value. This patch backports the fix >> [1] from OpenJDK7 (b56) to IcedTea6 >> >> Sun's bug entry: >> http://bugs.sun.com/view_bug.do?bug_id=6539464 >> Red Hat's bugzilla entry: >> https://bugzilla.redhat.com/show_bug.cgi?id=500077 >> >> ChangeLog: >> 2009-05-11 ?Omair Majid ? >> >> ? ? * patches/hotspot/default/icedtea-6539464.patch: New file. Backport >> ? ? ? fix for Sun Bug 6539464 from OpenJDK7 >> ? ? * Makefile.am (ICEDTEA_PATCHES): Apply the above. >> ? ? * HACKING: Document the above. > > Well caught! ?Please push this upstream straight away. ?I imagine it'll be > approved immediately. > > Andrew. > Except there's still no upstream hs14 to push 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 aph at redhat.com Tue May 12 05:25:45 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 12 May 2009 13:25:45 +0100 Subject: RFC: Backport fix for Sun Bug 6539464 (Math.log() produces inconsistent results) In-Reply-To: <17c6771e0905120508p48027029w977ac2c4ad8fa2aa@mail.gmail.com> References: <4A089B70.5040905@redhat.com> <4A0949F6.6060905@redhat.com> <17c6771e0905120508p48027029w977ac2c4ad8fa2aa@mail.gmail.com> Message-ID: <4A096AC9.3040805@redhat.com> Andrew John Hughes wrote: > 2009/5/12 Andrew Haley : >> Omair Majid wrote: >>> Hi, >>> >>> There is an issue in HS14 on x86_64 where calls to Math.log() can return >>> different values for the same input value. This patch backports the fix >>> [1] from OpenJDK7 (b56) to IcedTea6 >>> >>> Sun's bug entry: >>> http://bugs.sun.com/view_bug.do?bug_id=6539464 >>> Red Hat's bugzilla entry: >>> https://bugzilla.redhat.com/show_bug.cgi?id=500077 >>> >>> ChangeLog: >>> 2009-05-11 Omair Majid >>> >>> * patches/hotspot/default/icedtea-6539464.patch: New file. Backport >>> fix for Sun Bug 6539464 from OpenJDK7 >>> * Makefile.am (ICEDTEA_PATCHES): Apply the above. >>> * HACKING: Document the above. >> Well caught! Please push this upstream straight away. I imagine it'll be >> approved immediately. > Except there's still no upstream hs14 to push to... Well, yeah: tell us something we _don't_ know! No reason not to submit it upstream for approval. Andrew. From dbhole at redhat.com Tue May 12 06:46:21 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 12 May 2009 09:46:21 -0400 Subject: RFC: Add splash screen support to netx In-Reply-To: <4A08A47F.6030206@redhat.com> References: <4A08A47F.6030206@redhat.com> Message-ID: <20090512134621.GA18641@redhat.com> Hi Omair, This patch does not apply to HEAD.. Deepak * Omair Majid [2009-05-11 18:20]: > Hi, > > The attached patch allows Netx in IcedTea6 to display splash screens > while when launching a JNLP file. > > ChangeLog: > 2009-05-11 Omair Majid > > * rt/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. > This new class is responsible for displaying the splash screen. > * rt/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a > splash screen if specified in the JNLP file while loading the remote > jars. > * rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java > (getListener): Reposition the frame at the bottom right corner of > the screen. > > Cheers, > Omair From omajid at redhat.com Tue May 12 07:23:24 2009 From: omajid at redhat.com (Omair Majid) Date: Tue, 12 May 2009 10:23:24 -0400 Subject: RFC: Backport fix for Sun Bug 6539464 (Math.log() produces inconsistent results) In-Reply-To: <4A096AC9.3040805@redhat.com> References: <4A089B70.5040905@redhat.com> <4A0949F6.6060905@redhat.com> <17c6771e0905120508p48027029w977ac2c4ad8fa2aa@mail.gmail.com> <4A096AC9.3040805@redhat.com> Message-ID: <4A09865C.3070904@redhat.com> Andrew Haley wrote: > Andrew John Hughes wrote: >> 2009/5/12 Andrew Haley : >>> Omair Majid wrote: >>>> Hi, >>>> >>>> There is an issue in HS14 on x86_64 where calls to Math.log() can return >>>> different values for the same input value. This patch backports the fix >>>> [1] from OpenJDK7 (b56) to IcedTea6 >>>> >>>> Sun's bug entry: >>>> http://bugs.sun.com/view_bug.do?bug_id=6539464 >>>> Red Hat's bugzilla entry: >>>> https://bugzilla.redhat.com/show_bug.cgi?id=500077 >>>> >>>> ChangeLog: >>>> 2009-05-11 Omair Majid >>>> >>>> * patches/hotspot/default/icedtea-6539464.patch: New file. Backport >>>> fix for Sun Bug 6539464 from OpenJDK7 >>>> * Makefile.am (ICEDTEA_PATCHES): Apply the above. >>>> * HACKING: Document the above. >>> Well caught! Please push this upstream straight away. I imagine it'll be >>> approved immediately. > >> Except there's still no upstream hs14 to push to... > > Well, yeah: tell us something we _don't_ know! No reason not to submit > it upstream for approval. > > Andrew. Filed as http://bugs.openjdk.java.net/show_bug.cgi?id=100051 Cheers, Omair From aph at redhat.com Tue May 12 09:07:24 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 12 May 2009 17:07:24 +0100 Subject: Please do not touch HACKING or http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches In-Reply-To: <17c6771e0905080506j24139512u85c3a9277e9f9bef@mail.gmail.com> References: <4A041963.2030203@redhat.com> <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> <4A041FBE.6020209@redhat.com> <17c6771e0905080506j24139512u85c3a9277e9f9bef@mail.gmail.com> Message-ID: <4A099EBC.8010003@redhat.com> Andrew John Hughes wrote: > 2009/5/8 Andrew Haley : >> Andrew John Hughes wrote: >> >>> Sounds sensible to me. Can you make sure to add it to the HACKING >>> file/wiki page with any tracking data like bug IDs so we know that >>> this is already on its way upstream? >> Sure. Having to update HACKING and the wiki is rather painful; I >> wonder if I could just move everything to the wiki. >> > > Fine by me, especially if you're volunteering to do it ;) > It would be preferable to just have one source of such information. I > only mentioned both because we have a mix of information between the > two at present. I am now merging these. Please don't anyone touch either until I've finished. Andrew. From langel at redhat.com Tue May 12 10:04:06 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 12 May 2009 17:04:06 +0000 Subject: changeset in /hg/icedtea6: 2009-05-11 Lillian Angel changeset fd22df4a6701 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fd22df4a6701 description: 2009-05-11 Lillian Angel * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java (getDefaultBaseDir): Added check for home dir. Return null if homeDir not found in system properties. diffstat: 2 files changed, 9 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 5 +++-- diffs (28 lines): diff -r cc658d9f4a64 -r fd22df4a6701 ChangeLog --- a/ChangeLog Mon May 11 16:47:39 2009 -0400 +++ b/ChangeLog Tue May 12 13:04:57 2009 -0400 @@ -1,3 +1,9 @@ 2009-05-11 Lillian Angel + + * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java + (getDefaultBaseDir): Added check for home dir. Return null if homeDir + not found in system properties. + 2009-05-11 Lillian Angel * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java diff -r cc658d9f4a64 -r fd22df4a6701 rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon May 11 16:47:39 2009 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue May 12 13:04:57 2009 -0400 @@ -280,8 +280,9 @@ public class JNLPRuntime { if (isHeadless()) return null; - File baseDir = new File(System.getProperty("user.home") + "/.netx/"); - if (baseDir == null || !baseDir.mkdir()) + String homeDir = System.getProperty("user.home"); + File baseDir = new File(homeDir + "/.netx/"); + if (homeDir == null || !baseDir.mkdir()) return null; props.setProperty("basedir", baseDir.toString()); From omajid at redhat.com Tue May 12 14:35:36 2009 From: omajid at redhat.com (Omair Majid) Date: Tue, 12 May 2009 17:35:36 -0400 Subject: RFC: Add splash screen support to netx In-Reply-To: <4A08A47F.6030206@redhat.com> References: <4A08A47F.6030206@redhat.com> Message-ID: <4A09EBA8.5050504@redhat.com> Omair Majid wrote: > Hi, > > The attached patch allows Netx in IcedTea6 to display splash screens > while when launching a JNLP file. > > ChangeLog: > 2009-05-11 Omair Majid > > * rt/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. > This new class is responsible for displaying the splash screen. > * rt/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a > splash screen if specified in the JNLP file while loading the remote > jars. > * rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java > (getListener): Reposition the frame at the bottom right corner of > the screen. > > Cheers, > Omair > Patch updated to deal with bad URLs. Same changelog. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: netx-jnlp-splash-screen.patch Type: text/x-patch Size: 5856 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090512/da7f0f30/netx-jnlp-splash-screen.patch From bugzilla-daemon at icedtea.classpath.org Tue May 12 15:13:18 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 12 May 2009 22:13:18 +0000 Subject: [Bug 141] corba .prp files "contain restricted materials of IBM" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=141 ------- Comment #9 from gnu_andrew at member.fsf.org 2009-05-12 22:13 ------- Sun bug ID is actually 6565364. Appears to be fixed in b58, but the bug has not been updated. -- 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 May 12 15:15:06 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 12 May 2009 22:15:06 +0000 Subject: [Bug 141] corba .prp files "contain restricted materials of IBM" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=141 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #10 from gnu_andrew at member.fsf.org 2009-05-12 22:15 ------- http://hg.openjdk.java.net/jdk7/jdk7/corba/rev/e149090eb21a Was rolled in with a fix for 6529590. -- 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 May 12 15:15:06 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 12 May 2009 22:15:06 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 Bug 138 depends on bug 141, which changed state. Bug 141 Summary: corba .prp files "contain restricted materials of IBM" http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=141 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- 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 May 13 00:44:22 2009 From: mark at klomp.org (Mark Wielaard) Date: Wed, 13 May 2009 09:44:22 +0200 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <20090506150928.5999A5591@eggemoggin.niobe.net> References: <20090506150928.5999A5591@eggemoggin.niobe.net> Message-ID: <1242200662.3636.6.camel@hermans.wildebeest.org> Hi Mark, On Wed, 2009-05-06 at 08:09 -0700, Mark Reinhold wrote: > In order to move this forward, I'll go ahead and create the proposed > forests on hg.openjdk.java.net. Thanks, how are they called and are they already populated? I believe Lillian is holding up the IcedTea 1.5 release for this since that is (since 1.4) already based on hs14 and it would be good to make sure that instead of a jdk7/hotspot snapshot it would use the proper public hs14 repo. There are also people with pending patches against it that they would like to move upstream. > In the fullness of time I still think there's value in having a HotSpot > Express Project. Those of us who've been involved in this discussion > will understand what's going on, but it'd be good to have an obvious > place where people new to the topic can find documentation. There was a vote started to create a separate express project, but then aborted because of procedural issues (wrong mailinglist). It is unclear whether or not the project creation is stuck now. Cheers, Mark From gnu_andrew at member.fsf.org Wed May 13 05:20:30 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 13 May 2009 13:20:30 +0100 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <49FEC773.90601@Sun.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> Message-ID: <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> 2009/5/4 Peter Zhelezniakov : > Hello, > > NimbusLookAndFeel has been pushed recently and is now available in JDK7. > So from now on, JIBX libraries are required to build -- see details below. > > Thanks! > > Peter Zhelezniakov wrote: >> >> Hello, >> >> As part of the Nimbus forwardport into JDK7, a change to the build process >> is being made. >> >> Nimbus generates many of its source files automatically at build time. The >> generator is based on a third-party project, JIBX (jibx.sourceforge.net). >> Specifically, it needs the following 4 jar files to run: >> ? ? ? ?bcel.jar >> ? ? ? ?jibx-bind.jar >> ? ? ? ?jibx-run.jar >> ? ? ? ?xpp3.jar >> >> These files can be downloaded from >> >> http://sourceforge.net/project/showfiles.php?group_id=69358&package_id=68290 >> >> By default, these files are looked for in /java/devtools/share/jibx/lib or >> J:\share\jibx\lib. You can specify another path with the ALT_JIBX_LIBS_PATH >> variable. >> >> Note that this is a build-time dependency only; the jar files are not >> copied to the resulting build. > > -- > Peter > So I'm building with: LANG=C make ALT_BOOTDIR=$ICEDTEA_INSTALL \ ALT_PARALLEL_COMPILE_JOBS=$PARALLEL_JOBS \ HOTSPOT_BUILD_JOBS=$PARALLEL_JOBS \ ALT_JIXB_LIBS_PATH=/usr/share/java and even simply make ALT_JIXB_LIBS_PATH=/usr/share/java and the build doesn't listen: JIBX_LIBS_PATH = /NOT-SET/devtools/share/jibx/lib ALT_JIBX_LIBS_PATH = .... ERROR: You do not have access to valid JIBX library files. Please check your access to /NOT-SET/devtools/share/jibx/lib/jibx-run.jar and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_JIBX_LIBS_PATH Gah! Any one seen something similar or (better) had this actually work? -- 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 Anthony.Petrov at Sun.COM Wed May 13 05:34:53 2009 From: Anthony.Petrov at Sun.COM (Anthony Petrov) Date: Wed, 13 May 2009 16:34:53 +0400 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> Message-ID: <4A0ABE6D.80105@sun.com> Hi Andrew, On 05/13/2009 04:20 PM, Andrew John Hughes wrote: > So I'm building with: > > LANG=C make ALT_BOOTDIR=$ICEDTEA_INSTALL \ > ALT_PARALLEL_COMPILE_JOBS=$PARALLEL_JOBS \ > HOTSPOT_BUILD_JOBS=$PARALLEL_JOBS \ > ALT_JIXB_LIBS_PATH=/usr/share/java > > and even simply make ALT_JIXB_LIBS_PATH=/usr/share/java and the build > doesn't listen: > > JIBX_LIBS_PATH = /NOT-SET/devtools/share/jibx/lib > ALT_JIBX_LIBS_PATH = Please note the difference between JIBX - what makefiles expect, and JIXB - what you actually set. Good luck! :) -- best regards, Anthony > .... > ERROR: You do not have access to valid JIBX library files. > Please check your access to > /NOT-SET/devtools/share/jibx/lib/jibx-run.jar > and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_JIBX_LIBS_PATH > > Gah! Any one seen something similar or (better) had this actually work? From gnu_andrew at member.fsf.org Wed May 13 05:35:38 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 13 May 2009 13:35:38 +0100 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <4A0ABE06.4030204@Sun.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> <4A0ABE06.4030204@Sun.com> Message-ID: <17c6771e0905130535h2842aa79ge1565b153ddf3154@mail.gmail.com> 2009/5/13 Peter Zhelezniakov : > Andrew John Hughes wrote: >> >> and even simply make ALT_JIXB_LIBS_PATH=/usr/share/java and the build >> doesn't listen: > > It's JIBX and not JIXB :) > > -- > Peter ? ? ? ? ? ? ?| ?x33066 ?| ?location: SPB04 ?| ?timezone: GMT+03 > Bah! All these acronyms :) I keep thinking of JAXB, that's why... -- 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 Artem.Ananiev at Sun.COM Wed May 13 05:40:59 2009 From: Artem.Ananiev at Sun.COM (Artem Ananiev) Date: Wed, 13 May 2009 16:40:59 +0400 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> Message-ID: <4A0ABFDB.5050706@sun.com> Andrew John Hughes wrote: > So I'm building with: > > LANG=C make ALT_BOOTDIR=$ICEDTEA_INSTALL \ > ALT_PARALLEL_COMPILE_JOBS=$PARALLEL_JOBS \ > HOTSPOT_BUILD_JOBS=$PARALLEL_JOBS \ > ALT_JIXB_LIBS_PATH=/usr/share/java > > and even simply make ALT_JIXB_LIBS_PATH=/usr/share/java and the build > doesn't listen: > > JIBX_LIBS_PATH = /NOT-SET/devtools/share/jibx/lib > ALT_JIBX_LIBS_PATH = > .... > ERROR: You do not have access to valid JIBX library files. > Please check your access to > /NOT-SET/devtools/share/jibx/lib/jibx-run.jar > and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_JIBX_LIBS_PATH > > Gah! Any one seen something similar or (better) had this actually work? On Windows, my ALT_JIBX_LIBS_PATH was recognized correctly. However, I now see the following error: >>>Recursively making nimbus build @ Wed May 13 16:38:45 RDT 2009 ... make[2]: Entering directory `/cygdrive/c/work/ws/ie/make/javax/swing/plaf/nimbus' make[2]: *** No rule to make target `c:/work/ie-build-64/btjars/nimbus_generator.jar', needed by `c:/work/ie-build-64/gensrc/jav ax/swing/plaf/nimbus'. Stop. make[2]: Leaving directory `/cygdrive/c/work/ws/ie/make/javax/swing/plaf/nimbus' make[1]: *** [build] Error 1 make[1]: Leaving directory `/cygdrive/c/work/ws/ie/make/javax/swing/plaf' make: *** [build] Error 1 I tried both 3.78.1 and 3.80 versions of gnumake. Any ideas? Thanks, Artem From gnu_andrew at member.fsf.org Wed May 13 05:46:56 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 13 May 2009 13:46:56 +0100 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <4A0ABE06.4030204@Sun.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> <4A0ABE06.4030204@Sun.com> Message-ID: <17c6771e0905130546w48d9603bme55477d7229ed8e9@mail.gmail.com> 2009/5/13 Peter Zhelezniakov : > Andrew John Hughes wrote: >> >> and even simply make ALT_JIXB_LIBS_PATH=/usr/share/java and the build >> doesn't listen: > > It's JIBX and not JIXB :) > > -- > Peter ? ? ? ? ? ? ?| ?x33066 ?| ?location: SPB04 ?| ?timezone: GMT+03 > Peter, any idea which versions work? 1.0.1 packaged in Debian doesn't work. symbol : method getUserContext() location: interface org.jibx.runtime.IUnmarshallingContext canvasUIDefaults = (UIDefaults) context.getUserContext(); ^ classes/org/jdesktop/swingx/designer/jibxhelpers/CanvasMapper.java:99: cannot find symbol symbol : method setUserContext(javax.swing.UIDefaults) location: class org.jibx.runtime.impl.UnmarshallingContext uctx.setUserContext(uiDefaults); ^ classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.java:525: cannot find symbol symbol : method getUserContext() location: interface org.jibx.runtime.IUnmarshallingContext File resourcesDir = (File) context.getUserContext(); ^ classes/org/jdesktop/synthdesigner/generator/Generator.java:127: cannot find symbol symbol : method setUserContext(java.io.File) location: interface org.jibx.runtime.IUnmarshallingContext mctx.setUserContext(resourcesDir); Seems this thing is going to make OpenJDK even more of a nightmare to build... No-one else even packages this thing from what I can see. -- 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 May 13 06:20:28 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 13 May 2009 14:20:28 +0100 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <4A0AC722.2060105@Sun.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> <4A0ABE06.4030204@Sun.com> <17c6771e0905130546w48d9603bme55477d7229ed8e9@mail.gmail.com> <4A0AC722.2060105@Sun.com> Message-ID: <17c6771e0905130620p2eab5690xdf46f172dabfc65a@mail.gmail.com> 2009/5/13 Peter Zhelezniakov : > Andrew John Hughes wrote: >> >> Peter, any idea which versions work? ?1.0.1 packaged in Debian doesn't >> work. > > You need 1.1.5; it can be found e.g. here: > http://sourceforge.net/project/downloading.php?group_id=69358&filename=jibx_1_1_5.zip&a=65332220 > > -- > Peter > Thanks. The problem is no-one seems to package this version... :( Do you know if there is a symbol or similar which reports the current version? -- 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 langel at redhat.com Wed May 13 07:10:33 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 13 May 2009 14:10:33 +0000 Subject: changeset in /hg/icedtea6: 2009-05-13 Lillian Angel changeset f3427fa48e53 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f3427fa48e53 description: 2009-05-13 Lillian Angel * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java (PluginAppletSecurityContext): Added comment. * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (checkPermission): Fixed style. diffstat: 3 files changed, 13 insertions(+), 6 deletions(-) ChangeLog | 7 +++++++ plugin/icedtea/sun/applet/PluginAppletSecurityContext.java | 2 +- rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 10 +++++----- diffs (46 lines): diff -r fd22df4a6701 -r f3427fa48e53 ChangeLog --- a/ChangeLog Tue May 12 13:04:57 2009 -0400 +++ b/ChangeLog Wed May 13 10:11:28 2009 -0400 @@ -1,3 +1,10 @@ 2009-05-11 Lillian Angel + + * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java + (PluginAppletSecurityContext): Added comment. + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (checkPermission): Fixed style. + 2009-05-11 Lillian Angel * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java diff -r fd22df4a6701 -r f3427fa48e53 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java --- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java Tue May 12 13:04:57 2009 -0400 +++ b/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java Wed May 13 10:11:28 2009 -0400 @@ -248,7 +248,7 @@ public class PluginAppletSecurityContext // an applet will be loaded at some point, we should make it the SM // that JNLPRuntime will try to install if (System.getSecurityManager() == null) { - JNLPRuntime.initialize(false); + JNLPRuntime.initialize(/* isApplication */ false); } JNLPRuntime.disableExit(); diff -r fd22df4a6701 -r f3427fa48e53 rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Tue May 12 13:04:57 2009 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed May 13 10:11:28 2009 -0400 @@ -258,11 +258,11 @@ class JNLPSecurityManager extends Securi // Enable this manually -- it'll produce too much output for -verbose // otherwise. -// if (true) -// System.out.println("Checking permission: " + perm.toString()); - - if (!JNLPRuntime.isWebstartApplication() && ("setPolicy".equals(name) || - "setSecurityManager".equals(name))) + // if (true) + // System.out.println("Checking permission: " + perm.toString()); + + if (!JNLPRuntime.isWebstartApplication() && + ("setPolicy".equals(name) || "setSecurityManager".equals(name))) throw new SecurityException(R("RCantReplaceSM")); try { From langel at redhat.com Wed May 13 07:11:48 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 13 May 2009 10:11:48 -0400 Subject: [RFC]: Patch for bug #498108 In-Reply-To: <4A02ABC8.7030209@redhat.com> References: <4A01CC80.3060300@redhat.com> <4A02ABC8.7030209@redhat.com> Message-ID: <4A0AD524.6010800@redhat.com> Andrew Haley wrote: > Lillian Angel wrote: > > >> Attached is a patch to fix >> https://bugzilla.redhat.com/show_bug.cgi?id=498108. >> >> We need to remove the setPolicy restriction for trusted webstart >> applications, since each run in their own vm instance. Though the same >> code is used for plugins, and this restriction should still be upheld. I >> have added a parameter to JNLPRuntime.initialize to determine if a >> webstart application or a plugin applet are being initialized. >> > > Two minor style nits: > > >> diff -r a5006e51afe4 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java >> --- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java Tue May 05 14:42:36 2009 -0400 >> +++ b/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java Wed May 06 13:39:27 2009 -0400 >> @@ -248,7 +248,7 @@ >> // an applet will be loaded at some point, we should make it the SM >> // that JNLPRuntime will try to install >> if (System.getSecurityManager() == null) { >> - JNLPRuntime.initialize(); >> + JNLPRuntime.initialize(false); >> >> > > is much easier to read as something like: > > JNLPRuntime.initialize(/* isApplication */ false); > > >> diff -r a5006e51afe4 rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java >> --- a/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Tue May 05 14:42:36 2009 -0400 >> +++ b/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed May 06 13:39:27 2009 -0400 >> @@ -255,13 +255,14 @@ >> */ >> public void checkPermission(Permission perm) { >> String name = perm.getName(); >> - >> + >> // Enable this manually -- it'll produce too much output for -verbose >> // otherwise. >> // if (true) >> // System.out.println("Checking permission: " + perm.toString()); >> - if ("setPolicy".equals(name) || >> - "setSecurityManager".equals(name)) >> + >> + if (!JNLPRuntime.isWebstartApplication() && ("setPolicy".equals(name) || >> + "setSecurityManager".equals(name))) >> throw new SecurityException(R("RCantReplaceSM")); >> > > would be better as > > if (!JNLPRuntime.isWebstartApplication() && > ("setPolicy".equals(name) || "setSecurityManager".equals(name))) > throw new SecurityException(R("RCantReplaceSM")); > > I misunderstood this the first couple of times I read it. Both fixed. Thanks! Lillian From Peter.Zhelezniakov at Sun.COM Wed May 13 05:33:10 2009 From: Peter.Zhelezniakov at Sun.COM (Peter Zhelezniakov) Date: Wed, 13 May 2009 16:33:10 +0400 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> Message-ID: <4A0ABE06.4030204@Sun.com> Andrew John Hughes wrote: > and even simply make ALT_JIXB_LIBS_PATH=/usr/share/java and the build > doesn't listen: It's JIBX and not JIXB :) -- Peter | x33066 | location: SPB04 | timezone: GMT+03 From Peter.Zhelezniakov at Sun.COM Wed May 13 06:12:02 2009 From: Peter.Zhelezniakov at Sun.COM (Peter Zhelezniakov) Date: Wed, 13 May 2009 17:12:02 +0400 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <17c6771e0905130546w48d9603bme55477d7229ed8e9@mail.gmail.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> <4A0ABE06.4030204@Sun.com> <17c6771e0905130546w48d9603bme55477d7229ed8e9@mail.gmail.com> Message-ID: <4A0AC722.2060105@Sun.com> Andrew John Hughes wrote: > Peter, any idea which versions work? 1.0.1 packaged in Debian doesn't work. You need 1.1.5; it can be found e.g. here: http://sourceforge.net/project/downloading.php?group_id=69358&filename=jibx_1_1_5.zip&a=65332220 -- Peter From gnu_andrew at member.fsf.org Wed May 13 08:33:01 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 13 May 2009 16:33:01 +0100 Subject: Please do not touch HACKING or http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches In-Reply-To: <4A099EBC.8010003@redhat.com> References: <4A041963.2030203@redhat.com> <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> <4A041FBE.6020209@redhat.com> <17c6771e0905080506j24139512u85c3a9277e9f9bef@mail.gmail.com> <4A099EBC.8010003@redhat.com> Message-ID: <17c6771e0905130833y2866689bt13fa9f98b3224163@mail.gmail.com> 2009/5/12 Andrew Haley : > Andrew John Hughes wrote: >> 2009/5/8 Andrew Haley : >>> Andrew John Hughes wrote: >>> >>>> Sounds sensible to me. ?Can you make sure to add it to the HACKING >>>> file/wiki page with any tracking data like bug IDs so we know that >>>> this is already on its way upstream? >>> Sure. ?Having to update HACKING and the wiki is rather painful; I >>> wonder if I could just move everything to the wiki. >>> >> >> Fine by me, especially if you're volunteering to do it ;) >> It would be preferable to just have one source of such information. ?I >> only mentioned both because we have a mix of information between the >> two at present. > > I am now merging these. ?Please don't anyone touch either until I've > finished. > > Andrew. > Am I ok to attack the wiki page now? There are a few I can provide some answers for. -- 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 aph at redhat.com Wed May 13 08:35:45 2009 From: aph at redhat.com (Andrew Haley) Date: Wed, 13 May 2009 16:35:45 +0100 Subject: Please do not touch HACKING or http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches In-Reply-To: <17c6771e0905130833y2866689bt13fa9f98b3224163@mail.gmail.com> References: <4A041963.2030203@redhat.com> <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> <4A041FBE.6020209@redhat.com> <17c6771e0905080506j24139512u85c3a9277e9f9bef@mail.gmail.com> <4A099EBC.8010003@redhat.com> <17c6771e0905130833y2866689bt13fa9f98b3224163@mail.gmail.com> Message-ID: <4A0AE8D1.2080707@redhat.com> Andrew John Hughes wrote: > 2009/5/12 Andrew Haley : >> Andrew John Hughes wrote: >>> 2009/5/8 Andrew Haley : >>>> Andrew John Hughes wrote: >>>> >>>>> Sounds sensible to me. Can you make sure to add it to the HACKING >>>>> file/wiki page with any tracking data like bug IDs so we know that >>>>> this is already on its way upstream? >>>> Sure. Having to update HACKING and the wiki is rather painful; I >>>> wonder if I could just move everything to the wiki. >>>> >>> Fine by me, especially if you're volunteering to do it ;) >>> It would be preferable to just have one source of such information. I >>> only mentioned both because we have a mix of information between the >>> two at present. >> I am now merging these. Please don't anyone touch either until I've >> finished. > Am I ok to attack the wiki page now? There are a few I can provide > some answers for. OK. Thanks, Andrew. From thebohemian at gmx.net Wed May 13 08:49:43 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Wed, 13 May 2009 17:49:43 +0200 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option In-Reply-To: <17c6771e0905080727w7d051f6bh17798298b6b37a49@mail.gmail.com> References: <4A042EDC.40801@gmx.net> <17c6771e0905080648h7379720eva4a14afa270cb99d@mail.gmail.com> <4A043D36.70609@gmx.net> <17c6771e0905080727w7d051f6bh17798298b6b37a49@mail.gmail.com> Message-ID: <4A0AEC17.9060300@gmx.net> Hi Andrew, Andrew John Hughes schrieb: >>> I'd still prefer that the option's name more clearly related to its >>> purpose, as we discussed before, >> I think the name is what it does. It enables openjdk's cross-compilation >> support. At the moment this consists only of disabling the sanity checks >> but the next patch will handle calling 'uname -m' in certain places. As >> such I argue --disable-cc-incompatible-sanity-checks is not a good >> option (except you want 3 options related to cross-compilation in the end). >> > > Three options that are rarely used but have a clear meaning over one mega-option > where you have to look up what it actually does is preferable IMO. > Plus, as you say below, those who are cross-compiling will get the > option turned on by default anyway. I am not convinced that having 3 options is a good idea. It isn't also about a mega-option with ununderstandable effects. On the Automake-level it only selects a bunch of patches (3, maybe more). On the Makefile level those patches do different stuff. That is true, but the separation is done to make it easier to merge the changes back into OpenJDK at a later point. Making three options out of one adds a lot of boilerplate code to the main Makefile.am and then. All the options need to enable together to make sense. Enabling only one of them is not quite usefull. 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/20090513/9125f47e/signature.asc From thebohemian at gmx.net Wed May 13 08:56:20 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Wed, 13 May 2009 17:56:20 +0200 Subject: quilt for patch management? In-Reply-To: <4A044158.20909@redhat.com> References: <4A043697.9000501@gmx.net> <4A043B4B.7080606@redhat.com> <4A043C64.9070904@gmx.net> <4A044158.20909@redhat.com> Message-ID: <4A0AEDA4.7000002@gmx.net> Hi Andrew, Andrew Haley schrieb: > > OK. Why is it better to do > > patch -p0 < > > or > > quilt import -p0 You do the import once and after that quilt maintains the list of applied and not-applied patches. This allows going back and forth between the various patches conveniently (push/pop). > I don't get it. Seriously, I'm baffled: how would it make any difference? Updating patches could be done in a well described way. >> Furthermore how do you update a patch at the moment? Manually as well? >> quilt has a refresh command for this. It basically works like a poor man >> SCM sandbox. > Updating patches is probably a bad thing. It makes more sense to apply > the patch and your changes to pristine sources and regenerate. Sure this is what it would be. But how is this done at the moment. What steps are needed to do that on the command line? As I see this stuff needs manual work. But finally the initial mail was more of a: "Hey, I know this little tool to make work easier. We use it in OE in the same context. Should I think about implementing it or not?" As it looks people don't want it. So I let it be. 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/20090513/b6b4ab6c/signature.asc From Kelly.Ohair at Sun.COM Wed May 13 09:44:32 2009 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Wed, 13 May 2009 09:44:32 -0700 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <4A0ABFDB.5050706@sun.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> <4A0ABFDB.5050706@sun.com> Message-ID: <4A0AF8F0.7010509@sun.com> Artem Ananiev wrote: > > > Andrew John Hughes wrote: > >> So I'm building with: >> >> LANG=C make ALT_BOOTDIR=$ICEDTEA_INSTALL \ >> ALT_PARALLEL_COMPILE_JOBS=$PARALLEL_JOBS \ >> HOTSPOT_BUILD_JOBS=$PARALLEL_JOBS \ >> ALT_JIXB_LIBS_PATH=/usr/share/java >> >> and even simply make ALT_JIXB_LIBS_PATH=/usr/share/java and the build >> doesn't listen: >> >> JIBX_LIBS_PATH = /NOT-SET/devtools/share/jibx/lib >> ALT_JIBX_LIBS_PATH = >> .... >> ERROR: You do not have access to valid JIBX library files. >> Please check your access to >> /NOT-SET/devtools/share/jibx/lib/jibx-run.jar >> and/or check your value of ALT_JDK_DEVTOOLS_DIR, >> ALT_JIBX_LIBS_PATH >> >> Gah! Any one seen something similar or (better) had this actually work? > > On Windows, my ALT_JIBX_LIBS_PATH was recognized correctly. However, I > now see the following error: > > >>>Recursively making nimbus build @ Wed May 13 16:38:45 RDT 2009 ... > make[2]: Entering directory > `/cygdrive/c/work/ws/ie/make/javax/swing/plaf/nimbus' > make[2]: *** No rule to make target > `c:/work/ie-build-64/btjars/nimbus_generator.jar', needed by > `c:/work/ie-build-64/gensrc/jav > ax/swing/plaf/nimbus'. Stop. > make[2]: Leaving directory > `/cygdrive/c/work/ws/ie/make/javax/swing/plaf/nimbus' > make[1]: *** [build] Error 1 > make[1]: Leaving directory `/cygdrive/c/work/ws/ie/make/javax/swing/plaf' > make: *** [build] Error 1 > > I tried both 3.78.1 and 3.80 versions of gnumake. Any ideas? You need to figure out why the generator tool did not get created. Go into jdk/make/tools and try a 'make' there, see if the tools are getting built. The nimbus_generator.jar should exist at c:/work/ie-build-64/btjars/nimbus_generator.jar at this point in the build process. The build tools get built early on, once, so that anyone building just a part of the make tree isn't paying to constantly regenerate the tools. -kto -kto > > Thanks, > > Artem From dbhole at redhat.com Wed May 13 10:12:49 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 13 May 2009 13:12:49 -0400 Subject: RFC: Add splash screen support to netx In-Reply-To: <4A09EBA8.5050504@redhat.com> References: <4A08A47F.6030206@redhat.com> <4A09EBA8.5050504@redhat.com> Message-ID: <20090513171248.GB26435@redhat.com> * Omair Majid [2009-05-12 17:35]: > Omair Majid wrote: >> Hi, >> >> The attached patch allows Netx in IcedTea6 to display splash screens >> while when launching a JNLP file. >> >> ChangeLog: >> 2009-05-11 Omair Majid >> >> * rt/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. >> This new class is responsible for displaying the splash screen. >> * rt/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a >> splash screen if specified in the JNLP file while loading the remote >> jars. >> * rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java >> (getListener): Reposition the frame at the bottom right corner of >> the screen. >> >> Cheers, >> Omair >> > > Patch updated to deal with bad URLs. Same changelog. > Looks good! Assuming you have tested this, please go ahead and commit. Deepak From langel at redhat.com Wed May 13 10:49:44 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 13 May 2009 13:49:44 -0400 Subject: Please do not touch HACKING or http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches In-Reply-To: <4A0AE8D1.2080707@redhat.com> References: <4A041963.2030203@redhat.com> <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> <4A041FBE.6020209@redhat.com> <17c6771e0905080506j24139512u85c3a9277e9f9bef@mail.gmail.com> <4A099EBC.8010003@redhat.com> <17c6771e0905130833y2866689bt13fa9f98b3224163@mail.gmail.com> <4A0AE8D1.2080707@redhat.com> Message-ID: <4A0B0838.2010400@redhat.com> Andrew Haley wrote: > Andrew John Hughes wrote: > >> 2009/5/12 Andrew Haley : >> >>> Andrew John Hughes wrote: >>> >>>> 2009/5/8 Andrew Haley : >>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>> >>>>>> Sounds sensible to me. Can you make sure to add it to the HACKING >>>>>> file/wiki page with any tracking data like bug IDs so we know that >>>>>> this is already on its way upstream? >>>>>> >>>>> Sure. Having to update HACKING and the wiki is rather painful; I >>>>> wonder if I could just move everything to the wiki. >>>>> >>>>> >>>> Fine by me, especially if you're volunteering to do it ;) >>>> It would be preferable to just have one source of such information. I >>>> only mentioned both because we have a mix of information between the >>>> two at present. >>>> >>> I am now merging these. Please don't anyone touch either until I've >>> finished. >>> > > >> Am I ok to attack the wiki page now? There are a few I can provide >> some answers for. >> > > OK. Is there a reason we are keeping obsolete patches around? I see they are listed in HACKING, still exist in the patches directory and are listed on the wiki. Lillian From aph at redhat.com Wed May 13 10:51:46 2009 From: aph at redhat.com (Andrew Haley) Date: Wed, 13 May 2009 18:51:46 +0100 Subject: Please do not touch HACKING or http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches In-Reply-To: <4A0B0838.2010400@redhat.com> References: <4A041963.2030203@redhat.com> <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> <4A041FBE.6020209@redhat.com> <17c6771e0905080506j24139512u85c3a9277e9f9bef@mail.gmail.com> <4A099EBC.8010003@redhat.com> <17c6771e0905130833y2866689bt13fa9f98b3224163@mail.gmail.com> <4A0AE8D1.2080707@redhat.com> <4A0B0838.2010400@redhat.com> Message-ID: <4A0B08B2.3050006@redhat.com> Lillian Angel wrote: > Is there a reason we are keeping obsolete patches around? I see they are > listed in HACKING, still exist in the patches directory and are listed > on the wiki. No, none. If we ever need to resurrect a patch we can get it from Hg. Andrew. From langel at redhat.com Wed May 13 10:54:59 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 13 May 2009 17:54:59 +0000 Subject: changeset in /hg/icedtea6: 2009-05-13 Lillian Angel changeset 370d4ef5ff5c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=370d4ef5ff5c description: 2009-05-13 Lillian Angel * patches/icedtea-certbundle.patch: Removed. * patches/icedtea-liveconnect.patch: Removed. diffstat: 3 files changed, 5 insertions(+), 385 deletions(-) ChangeLog | 5 patches/icedtea-certbundle.patch | 240 ------------------------------------- patches/icedtea-liveconnect.patch | 145 ---------------------- diffs (405 lines): diff -r f3427fa48e53 -r 370d4ef5ff5c ChangeLog --- a/ChangeLog Wed May 13 10:11:28 2009 -0400 +++ b/ChangeLog Wed May 13 13:55:55 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-13 Lillian Angel + + * patches/icedtea-certbundle.patch: Removed. + * patches/icedtea-liveconnect.patch: Removed. + 2009-05-13 Lillian Angel * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java diff -r f3427fa48e53 -r 370d4ef5ff5c patches/icedtea-certbundle.patch --- a/patches/icedtea-certbundle.patch Wed May 13 10:11:28 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,240 +0,0 @@ -diff -urN openjdk.orig/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java openjdk/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java ---- openjdk.orig/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java 2007-10-12 18:24:05.000000000 -0400 -@@ -0,0 +1,199 @@ -+/* CertBundleKeyStoreImpl.java -+ Copyright (C) 2007 Casey Marshall -+ -+This file is part of IcedTea. -+ -+IcedTea is free software; you can redistribute it and/or -+modify it under the terms of the GNU General Public License as -+published by the Free Software Foundation, version 2. -+ -+IcedTea 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 for more details. -+ -+You should have received a copy of the GNU General Public License -+along with IcedTea; see the file COPYING. If not, write to -+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+Boston, MA 02110-1301 USA. -+ -+Linking this library statically or dynamically with other modules is -+making a combined work based on this library. Thus, the terms and -+conditions of the GNU General Public License cover the whole -+combination. -+ -+As a special exception, the copyright holders of this library give you -+permission to link this library with independent modules to produce an -+executable, regardless of the license terms of these independent -+modules, and to copy and distribute the resulting executable under -+terms of your choice, provided that you also meet, for each linked -+independent module, the terms and conditions of the license of that -+module. An independent module is a module which is not derived from -+or based on this library. If you modify this library, you may extend -+this exception to your version of the library, but you are not -+obligated to do so. If you do not wish to do so, delete this -+exception statement from your version. */ -+ -+ -+package sun.security.provider; -+ -+import java.io.BufferedReader; -+import java.io.ByteArrayInputStream; -+import java.io.ByteArrayOutputStream; -+import java.io.IOException; -+import java.io.InputStream; -+import java.io.InputStreamReader; -+import java.io.OutputStream; -+import java.io.OutputStreamWriter; -+import java.io.PrintWriter; -+import java.security.Key; -+import java.security.KeyStoreException; -+import java.security.KeyStoreSpi; -+import java.security.NoSuchAlgorithmException; -+import java.security.UnrecoverableKeyException; -+import java.security.cert.Certificate; -+import java.security.cert.CertificateException; -+import java.security.cert.CertificateFactory; -+import java.util.Date; -+import java.util.Enumeration; -+import java.util.HashMap; -+import java.util.Map; -+import java.util.Vector; -+ -+/** -+ * A key store implementation for "certificate bundle" files, commonly used -+ * on many free operating systems. Certificate bundles are plain text files -+ * containing one or more "PEM" encoded X.509 certificates, which comprise -+ * a list of trusted root certificates. -+ * -+ * This class implements a read-only key store that reads in one or more -+ * certificate bundles, storing all certificates successfully read. Calling -+ * load multiple times will add certificates to the store. -+ * -+ * @author Casey Marshall (csm at gnu.org) -+ */ -+public class CertBundleKeyStoreImpl extends KeyStoreSpi -+{ -+ private int x = 0; -+ private Map certs = new HashMap(); -+ -+ @Override public Enumeration engineAliases() -+ { -+ return new Vector(certs.keySet()).elements(); -+ } -+ -+ @Override public boolean engineContainsAlias(String alias) -+ { -+ return certs.containsKey(alias); -+ } -+ -+ @Override public void engineDeleteEntry(String alias) throws KeyStoreException -+ { -+ certs.remove(alias); -+ } -+ -+ @Override public Certificate engineGetCertificate(String alias) -+ { -+ return certs.get(alias); -+ } -+ -+ @Override public String engineGetCertificateAlias(Certificate cert) -+ { -+ for (Map.Entry e : certs.entrySet()) -+ { -+ if (e.getValue().equals(cert)) -+ return e.getKey(); -+ } -+ return null; -+ } -+ -+ @Override public Certificate[] engineGetCertificateChain(String arg0) -+ { -+ return null; -+ } -+ -+ @Override public Date engineGetCreationDate(String alias) -+ { -+ return new Date(0); -+ } -+ -+ @Override public Key engineGetKey(String arg0, char[] arg1) -+ throws NoSuchAlgorithmException, UnrecoverableKeyException -+ { -+ return null; -+ } -+ -+ @Override public boolean engineIsCertificateEntry(String alias) -+ { -+ return certs.containsKey(alias); -+ } -+ -+ @Override public boolean engineIsKeyEntry(String arg0) -+ { -+ return false; -+ } -+ -+ @Override public void engineLoad(InputStream in, char[] arg1) -+ throws IOException, NoSuchAlgorithmException, CertificateException -+ { -+ CertificateFactory cf = CertificateFactory.getInstance("X.509"); -+ ByteArrayOutputStream bout = new ByteArrayOutputStream(); -+ PrintWriter out = new PrintWriter(new OutputStreamWriter(bout)); -+ BufferedReader rin = new BufferedReader(new InputStreamReader(in)); -+ String line; -+ boolean push = false; -+ while ((line = rin.readLine()) != null) -+ { -+ if (line.equals("-----BEGIN CERTIFICATE-----")) -+ { -+ push = true; -+ out.println(line); -+ } -+ else if (push) -+ { -+ out.println(line); -+ if (line.equals("-----END CERTIFICATE-----")) -+ { -+ push = false; -+ out.flush(); -+ byte[] bytes = bout.toByteArray(); -+ Certificate cert = cf.generateCertificate(new ByteArrayInputStream(bytes)); -+ bout.reset(); -+ String alias = "cert-" + (x++); -+ certs.put(alias, cert); -+ } -+ } -+ } -+ } -+ -+ @Override public void engineSetCertificateEntry(String alias, Certificate cert) -+ throws KeyStoreException -+ { -+ certs.put(alias, cert); -+ } -+ -+ @Override public void engineSetKeyEntry(String arg0, byte[] arg1, -+ Certificate[] arg2) -+ throws KeyStoreException -+ { -+ throw new KeyStoreException("not supported"); -+ } -+ -+ @Override public void engineSetKeyEntry(String arg0, Key arg1, char[] arg2, -+ Certificate[] arg3) -+ throws KeyStoreException -+ { -+ throw new KeyStoreException("not supported"); -+ } -+ -+ @Override public int engineSize() -+ { -+ return certs.size(); -+ } -+ -+ @Override public void engineStore(OutputStream arg0, char[] arg1) -+ throws IOException, NoSuchAlgorithmException, CertificateException -+ { -+ throw new UnsupportedOperationException("read-only key stores"); -+ } -+} ---- ../opeinjdkb23/openjdk/jdk/src/share/classes/sun/security/provider/SunEntries.java 2007-10-30 04:38:07.000000000 -0400 -+++ openjdk/jdk/src/share/classes/sun/security/provider/SunEntries.java 2007-11-13 13:13:21.000000000 -0500 -@@ -178,6 +178,7 @@ - map.put("KeyStore.JKS", "sun.security.provider.JavaKeyStore$JKS"); - map.put("KeyStore.CaseExactJKS", - "sun.security.provider.JavaKeyStore$CaseExactJKS"); -+ map.put("KeyStore.CertBundle", "sun.security.provider.CertBundleKeyStoreImpl"); - - /* - * Policy ---- openjdkold/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2008-03-26 04:59:04.000000000 -0400 -+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2008-05-08 10:49:22.000000000 -0400 -@@ -142,16 +142,21 @@ - public Void run() throws Exception { - props.put("trustStore", System.getProperty( - "javax.net.ssl.trustStore")); -- props.put("javaHome", System.getProperty( -- "java.home")); - props.put("trustStoreType", System.getProperty( - "javax.net.ssl.trustStoreType", - KeyStore.getDefaultType())); -+ props.put("javaHome", System.getProperty( -+ "java.home")); - props.put("trustStoreProvider", System.getProperty( - "javax.net.ssl.trustStoreProvider", "")); - props.put("trustStorePasswd", System.getProperty( - "javax.net.ssl.trustStorePassword", "")); -- return null; -+ props.put("/etc/pki/tls/certs/ca-bundle.crt", System.getProperty( -+ "javax.net.ssl.trustStore")); -+ props.put("CertBundle", System.getProperty( -+ "javax.net.ssl.trustStoreType", -+ KeyStore.getDefaultType())); -+ return null; - } - }); - diff -r f3427fa48e53 -r 370d4ef5ff5c patches/icedtea-liveconnect.patch --- a/patches/icedtea-liveconnect.patch Wed May 13 10:11:28 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,145 +0,0 @@ -diff -urN openjdk.orig/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile ---- openjdk.orig/jdk/make/sun/Makefile 2008-07-10 15:54:44.000000000 -0400 -+++ openjdk/jdk/make/sun/Makefile 2008-09-18 14:28:41.000000000 -0400 -@@ -66,6 +66,7 @@ - $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ - font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ - jawt text nio launcher management $(ORG_SUBDIR) \ -+ plugin \ - native2ascii serialver tools jconsole - - all build clean clobber:: -diff -urN openjdk.orig/jdk/make/sun/Makefile.orig openjdk/jdk/make/sun/Makefile.orig ---- openjdk.orig/jdk/make/sun/Makefile.orig 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/make/sun/Makefile.orig 2008-09-18 14:28:41.000000000 -0400 -@@ -0,0 +1,73 @@ -+# -+# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved. -+# 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. Sun designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# 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. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+ -+# -+# Makefile for building all of sun tools -+# -+ -+BUILDDIR = .. -+PRODUCT = sun -+include $(BUILDDIR)/common/Defs.gmk -+ -+# Rhino/Mozilla java sources -+ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,) -+ifneq ("$(ORG_EXISTS)", "") -+ ORG_SUBDIR = org -+endif -+ -+# Non windows subdirs -+ifneq ($(PLATFORM), windows) -+ ifndef OPENJDK -+ ifeq ($(PLATFORM), solaris) -+ ifneq ($(ARCH), amd64) -+ DGA_SUBDIR = jdga -+ endif -+ endif -+ endif -+ ifeq ($(MOTIF_REQUIRED), true) -+ MOTIF_SUBDIRS = motif12 motif21 -+ endif -+ HEADLESS_SUBDIR = headless -+ XAWT_SUBDIR = xawt -+endif -+ -+ifndef OPENJDK -+ JDBC_SUBDIR = jdbc -+endif -+ifdef OPENJDK -+ RENDER_SUBDIR = pisces -+else -+ RENDER_SUBDIR = dcpr -+endif -+SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \ -+ awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ -+ $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ -+ font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ -+ jawt text nio launcher management $(ORG_SUBDIR) \ -+ native2ascii serialver tools jconsole -+ -+all build clean clobber:: -+ $(SUBDIRS-loop) -+ -diff -urN openjdk.orig/jdk/make/sun/plugin/Makefile openjdk/jdk/make/sun/plugin/Makefile ---- openjdk.orig/jdk/make/sun/plugin/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/make/sun/plugin/Makefile 2008-09-18 14:28:41.000000000 -0400 -@@ -0,0 +1,53 @@ -+# -+# Copyright 1995-2005 Sun Microsystems, Inc. All Rights Reserved. -+# 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. Sun designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# 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. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+ -+# -+# Makefile for pluginappletviewer wrapper. -+# -+ -+BUILDDIR = ../.. -+PACKAGE = sun.applet -+PRODUCT = sun -+PROGRAM = pluginappletviewer -+include $(BUILDDIR)/common/Defs.gmk -+ -+# -+# Files to compile. -+# -+AUTO_FILES_JAVA_DIRS = sun/applet -+ -+ifneq ($(PLATFORM), windows) -+ # -+ # Anything with a GUI needs X11 to be linked in. -+ # -+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -+endif # PLATFORM -+ -+# -+# Rules -+# -+JAVA_ARGS = "{ \"sun.applet.PluginMain\" }" -+include $(BUILDDIR)/common/Program.gmk -+ From gnu_andrew at member.fsf.org Wed May 13 10:58:46 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 13 May 2009 18:58:46 +0100 Subject: Please do not touch HACKING or http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches In-Reply-To: <4A0B08B2.3050006@redhat.com> References: <4A041963.2030203@redhat.com> <17c6771e0905080445u7c99efla3e796152763924e@mail.gmail.com> <4A041FBE.6020209@redhat.com> <17c6771e0905080506j24139512u85c3a9277e9f9bef@mail.gmail.com> <4A099EBC.8010003@redhat.com> <17c6771e0905130833y2866689bt13fa9f98b3224163@mail.gmail.com> <4A0AE8D1.2080707@redhat.com> <4A0B0838.2010400@redhat.com> <4A0B08B2.3050006@redhat.com> Message-ID: <17c6771e0905131058h1911f3fcj2e1196f5e713e39d@mail.gmail.com> 2009/5/13 Andrew Haley : > Lillian Angel wrote: > >> Is there a reason we are keeping obsolete patches around? I see they are >> listed in HACKING, still exist in the patches directory and are listed >> on the wiki. > > No, none. ?If we ever need to resurrect a patch we can get it from Hg. > > Andrew. > Nope. Personally I always hg rm any patches I remove from Makefile.am. -- 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 langel at redhat.com Wed May 13 11:42:39 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 13 May 2009 18:42:39 +0000 Subject: changeset in /hg/icedtea6: 2009-05-13 Lillian Angel changeset 813f65587cf8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=813f65587cf8 description: 2009-05-13 Lillian Angel * patches/icedtea-enum-bug-181.patch: Removed. diffstat: 2 files changed, 4 insertions(+), 11 deletions(-) ChangeLog | 4 ++++ patches/icedtea-enum-bug-181.patch | 11 ----------- diffs (26 lines): diff -r 370d4ef5ff5c -r 813f65587cf8 ChangeLog --- a/ChangeLog Wed May 13 13:55:55 2009 -0400 +++ b/ChangeLog Wed May 13 14:43:36 2009 -0400 @@ -1,3 +1,7 @@ 2009-05-13 Lillian Angel + + * patches/icedtea-enum-bug-181.patch: Removed. + 2009-05-13 Lillian Angel * patches/icedtea-certbundle.patch: Removed. diff -r 370d4ef5ff5c -r 813f65587cf8 patches/icedtea-enum-bug-181.patch --- a/patches/icedtea-enum-bug-181.patch Wed May 13 13:55:55 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- openjdkold/jdk/src/share/classes/sun/beans/editors/EnumEditor.java 2008-07-10 15:57:13.000000000 -0400 -+++ openjdk/jdk/src/share/classes/sun/beans/editors/EnumEditor.java 2008-08-11 15:07:05.000000000 -0400 -@@ -67,7 +67,7 @@ - } - - public void setValue( Object value ) { -- if ( ( value != null ) && ( this.type != value.getClass() ) ) { -+ if ( ( value != null ) && ! ( this.type.isInstance( value ) ) ) { - throw new IllegalArgumentException( "Unsupported value: " + value ); - } - Object oldValue; From langel at redhat.com Wed May 13 12:30:32 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 13 May 2009 19:30:32 +0000 Subject: changeset in /hg/icedtea6: 2009-05-13 Lillian Angel changeset d634a26fa3ce in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d634a26fa3ce description: 2009-05-13 Lillian Angel * patches/icedtea-liveconnect.patch: Re-added. * HACKING: liveconnect patch is not obsolete. diffstat: 3 files changed, 152 insertions(+), 3 deletions(-) ChangeLog | 5 + HACKING | 5 - patches/icedtea-liveconnect.patch | 145 +++++++++++++++++++++++++++++++++++++ diffs (184 lines): diff -r 813f65587cf8 -r d634a26fa3ce ChangeLog --- a/ChangeLog Wed May 13 14:43:36 2009 -0400 +++ b/ChangeLog Wed May 13 15:31:29 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-13 Lillian Angel + + * patches/icedtea-liveconnect.patch: Re-added. + * HACKING: liveconnect patch is not obsolete. + 2009-05-13 Lillian Angel * patches/icedtea-enum-bug-181.patch: Removed. diff -r 813f65587cf8 -r d634a26fa3ce HACKING --- a/HACKING Wed May 13 14:43:36 2009 -0400 +++ b/HACKING Wed May 13 15:31:29 2009 -0400 @@ -130,9 +130,9 @@ The following patches are only applied t java.lang.Double and java.lang.Float. * icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar. (PR261) -The following patches are only applied when building with experimental NetX plugin support: +The following patches are only applied when building with the plugin support: -* icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel. +* icedtea-liveconnect.patch: Add LiveConnect support to plugin. The following patches are only applied when building with the CACAO virtual machine: @@ -151,7 +151,6 @@ changes to the OpenJDK code base and/or * icedtea-color-profiles.patch: Add missing color profiles (S6523403): Included upstream in OpenJDK6 b10 and OpenJDK7 b28. * icedtea-hat-spl-gpl.patch: JHat has conflicting GPL/SPL licensing terms (PR143/S6695553): Included upstream in OpenJDK6 b10 and OpenJDK7 b29. * icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH: Obsoleted by icedtea-headers.patch. -* icedtea-liveconnect.patch: Add LiveConnect support to plugin: No longer developed. * icedtea-netx-applet-visibility.patch: Make applet classes package-private for the plugin: Obsoleted by icedtea-webservices.patch. * icedtea-xinerama.patch: Fix crash talking to second X screen (S6604044): Included upstream in OpenJDK6 b10 and OpenJDK7 b28. * icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13. diff -r 813f65587cf8 -r d634a26fa3ce patches/icedtea-liveconnect.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-liveconnect.patch Wed May 13 15:31:29 2009 -0400 @@ -0,0 +1,145 @@ +diff -urN openjdk.orig/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile +--- openjdk.orig/jdk/make/sun/Makefile 2008-07-10 15:54:44.000000000 -0400 ++++ openjdk/jdk/make/sun/Makefile 2008-09-18 14:28:41.000000000 -0400 +@@ -66,6 +66,7 @@ + $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ + font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ + jawt text nio launcher management $(ORG_SUBDIR) \ ++ plugin \ + native2ascii serialver tools jconsole + + all build clean clobber:: +diff -urN openjdk.orig/jdk/make/sun/Makefile.orig openjdk/jdk/make/sun/Makefile.orig +--- openjdk.orig/jdk/make/sun/Makefile.orig 1969-12-31 19:00:00.000000000 -0500 ++++ openjdk/jdk/make/sun/Makefile.orig 2008-09-18 14:28:41.000000000 -0400 +@@ -0,0 +1,73 @@ ++# ++# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved. ++# 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. Sun designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Sun in the LICENSE file that accompanied this code. ++# ++# 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. ++# ++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++# CA 95054 USA or visit www.sun.com if you need additional information or ++# have any questions. ++# ++ ++# ++# Makefile for building all of sun tools ++# ++ ++BUILDDIR = .. ++PRODUCT = sun ++include $(BUILDDIR)/common/Defs.gmk ++ ++# Rhino/Mozilla java sources ++ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,) ++ifneq ("$(ORG_EXISTS)", "") ++ ORG_SUBDIR = org ++endif ++ ++# Non windows subdirs ++ifneq ($(PLATFORM), windows) ++ ifndef OPENJDK ++ ifeq ($(PLATFORM), solaris) ++ ifneq ($(ARCH), amd64) ++ DGA_SUBDIR = jdga ++ endif ++ endif ++ endif ++ ifeq ($(MOTIF_REQUIRED), true) ++ MOTIF_SUBDIRS = motif12 motif21 ++ endif ++ HEADLESS_SUBDIR = headless ++ XAWT_SUBDIR = xawt ++endif ++ ++ifndef OPENJDK ++ JDBC_SUBDIR = jdbc ++endif ++ifdef OPENJDK ++ RENDER_SUBDIR = pisces ++else ++ RENDER_SUBDIR = dcpr ++endif ++SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \ ++ awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ ++ $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ ++ font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ ++ jawt text nio launcher management $(ORG_SUBDIR) \ ++ native2ascii serialver tools jconsole ++ ++all build clean clobber:: ++ $(SUBDIRS-loop) ++ +diff -urN openjdk.orig/jdk/make/sun/plugin/Makefile openjdk/jdk/make/sun/plugin/Makefile +--- openjdk.orig/jdk/make/sun/plugin/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ openjdk/jdk/make/sun/plugin/Makefile 2008-09-18 14:28:41.000000000 -0400 +@@ -0,0 +1,53 @@ ++# ++# Copyright 1995-2005 Sun Microsystems, Inc. All Rights Reserved. ++# 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. Sun designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Sun in the LICENSE file that accompanied this code. ++# ++# 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. ++# ++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++# CA 95054 USA or visit www.sun.com if you need additional information or ++# have any questions. ++# ++ ++# ++# Makefile for pluginappletviewer wrapper. ++# ++ ++BUILDDIR = ../.. ++PACKAGE = sun.applet ++PRODUCT = sun ++PROGRAM = pluginappletviewer ++include $(BUILDDIR)/common/Defs.gmk ++ ++# ++# Files to compile. ++# ++AUTO_FILES_JAVA_DIRS = sun/applet ++ ++ifneq ($(PLATFORM), windows) ++ # ++ # Anything with a GUI needs X11 to be linked in. ++ # ++ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 ++endif # PLATFORM ++ ++# ++# Rules ++# ++JAVA_ARGS = "{ \"sun.applet.PluginMain\" }" ++include $(BUILDDIR)/common/Program.gmk ++ From omajid at redhat.com Wed May 13 12:37:36 2009 From: omajid at redhat.com (Omair Majid) Date: Wed, 13 May 2009 19:37:36 +0000 Subject: changeset in /hg/icedtea6: 2009-05-13 Omair Majid changeset 50c172a7a7f4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=50c172a7a7f4 description: 2009-05-13 Omair Majid * rt/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. This new class is responsible for displaying the splash screen. * rt/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a splash screen if specified in the JNLP file while loading the remote jars. * rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java (getListener): Reposition the frame at the bottom right corner of the screen. diffstat: 4 files changed, 131 insertions(+), 3 deletions(-) ChangeLog | 9 + rt/net/sourceforge/jnlp/JNLPSplashScreen.java | 93 +++++++++++ rt/net/sourceforge/jnlp/Launcher.java | 23 ++ rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 9 - diffs (172 lines): diff -r d634a26fa3ce -r 50c172a7a7f4 ChangeLog --- a/ChangeLog Wed May 13 15:31:29 2009 -0400 +++ b/ChangeLog Wed May 13 15:36:33 2009 -0400 @@ -1,3 +1,12 @@ 2009-05-13 Lillian Angel + + * rt/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. This new class + is responsible for displaying the splash screen. + * rt/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a splash + screen if specified in the JNLP file while loading the remote jars. + * rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java (getListener): + Reposition the frame at the bottom right corner of the screen. + 2009-05-13 Lillian Angel * patches/icedtea-liveconnect.patch: Re-added. diff -r d634a26fa3ce -r 50c172a7a7f4 rt/net/sourceforge/jnlp/JNLPSplashScreen.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/net/sourceforge/jnlp/JNLPSplashScreen.java Wed May 13 15:36:33 2009 -0400 @@ -0,0 +1,93 @@ +package net.sourceforge.jnlp; + +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Insets; +import java.awt.Toolkit; +import java.io.IOException; +import java.net.URL; + +import javax.imageio.ImageIO; +import javax.swing.JFrame; + +import net.sourceforge.jnlp.cache.ResourceTracker; +import net.sourceforge.jnlp.runtime.JNLPRuntime; + +public class JNLPSplashScreen extends JFrame { + + String applicationTitle; + String applicationVendor; + + ResourceTracker resourceTracker; + + URL splashImageUrl; + Image splashImage; + + public JNLPSplashScreen(ResourceTracker resourceTracker, + String applicationTitle, String applicationVendor) { + + // If the JNLP file does not contain any icon images, the splash image + // will consist of the application's title and vendor, as taken from the + // JNLP file. + + this.resourceTracker = resourceTracker; + this.applicationTitle = applicationTitle; + this.applicationVendor = applicationVendor; + + } + + public void setSplashImageURL(URL url) { + splashImageUrl = url; + splashImage = null; + try { + splashImage = ImageIO.read(resourceTracker + .getCacheFile(splashImageUrl)); + } catch (IOException e) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + splashImage = null; + return; + } catch (IllegalArgumentException argumentException) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + splashImage = null; + return; + } + + correctSize(); + } + + public boolean isSplashScreenValid() { + return (splashImage != null); + } + + private void correctSize() { + + Insets insets = getInsets(); + int minimumWidth = splashImage.getWidth(null) + insets.left + + insets.right; + int minimumHeight = splashImage.getHeight(null) + insets.top + + insets.bottom; + setMinimumSize(new Dimension(minimumWidth, minimumHeight)); + + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + setLocation((screenSize.width - minimumWidth) / 2, + (screenSize.height - minimumHeight) / 2); + } + + @Override + public void paint(Graphics g) { + if (splashImage == null) { + return; + } + + correctSize(); + Graphics2D g2 = (Graphics2D) g; + g2.drawImage(splashImage, getInsets().left, getInsets().top, null); + + } +} diff -r d634a26fa3ce -r 50c172a7a7f4 rt/net/sourceforge/jnlp/Launcher.java --- a/rt/net/sourceforge/jnlp/Launcher.java Wed May 13 15:31:29 2009 -0400 +++ b/rt/net/sourceforge/jnlp/Launcher.java Wed May 13 15:36:33 2009 -0400 @@ -331,6 +331,22 @@ public class Launcher { throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotApplication"), R("LNotApplicationInfo"))); try { + final int preferredWidth = 500; + final int preferredHeight = 400; + JNLPSplashScreen splashScreen = null; + URL splashImageURL = file.getInformation().getIconLocation( + IconDesc.SPLASH, preferredWidth, preferredHeight); + if (splashImageURL != null) { + ResourceTracker resourceTracker = new ResourceTracker(true); + resourceTracker.addResource(splashImageURL, "SPLASH", file.getFileVersion(), updatePolicy); + splashScreen = new JNLPSplashScreen(resourceTracker, null, null); + splashScreen.setSplashImageURL(splashImageURL); + if (splashScreen.isSplashScreenValid()) { + splashScreen.setVisible(true); + } + } + + ApplicationInstance app = createApplication(file); app.initialize(); @@ -360,6 +376,13 @@ public class Launcher { // required to make some apps work right Thread.currentThread().setContextClassLoader(app.getClassLoader()); + + if (splashScreen != null) { + if (splashScreen.isSplashScreenValid()) { + splashScreen.setVisible(false); + } + splashScreen.dispose(); + } main.invoke(null, new Object[] { args } ); diff -r d634a26fa3ce -r 50c172a7a7f4 rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java --- a/rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java Wed May 13 15:31:29 2009 -0400 +++ b/rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java Wed May 13 15:36:33 2009 -0400 @@ -110,9 +110,12 @@ public class DefaultDownloadIndicator im frame.pack(); if (!frame.isVisible()) { - Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); - frame.setLocation(screen.width/2-frame.getWidth()/2, - screen.height/2-frame.getHeight()/2); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(frame.getGraphicsConfiguration()); + Dimension screen = new Dimension(screenSize.width - insets.left , + screenSize.height - insets.top); + frame.setLocation(screen.width-frame.getWidth(), + screen.height-frame.getHeight()); } frame.show(); From omajid at redhat.com Wed May 13 13:01:35 2009 From: omajid at redhat.com (Omair Majid) Date: Wed, 13 May 2009 16:01:35 -0400 Subject: RFC: Add support for 'java' tag and it's attributes in NetX Message-ID: <4A0B271F.2050904@redhat.com> Hi, JNLP 6 allows using the 'java' element inside a jnlp file instead of 'j2se'. This patch allows NetX to treat the 'java' element as if it were a 'j2se' element. AFAIK, NetX doesnt do anything with this yet. This patch also makes NetX read and parse the 'java-vm-args' attribute of the java/j2se tag. Just like 'initial-heap-size' and 'max-heap-size', this is not used anywhere by NetX. ChangeLog: 2009-05-13 Omair Majid * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to reflect that the element can be either 'java' or 'j2se'. * rt/net/sourceforge/jnlp/JREDesc.java: Fix comment to reflect a 'java' element. New private variable vmArgs to keep track of 'java-vm-args'. (JREDesc): Modify to take in an additional parameter vmArgs and store it in vmArgs. (getVMArgs): New function. Return the value of 'java-vm-args' attribute. * rt/net/sourceforge/jnlp/Parser.java: Fix comments to reflect either a 'java' or 'j2se' element. (getResourceDesc): Treat 'java' element identically to 'j2se' element. (getJRE): Read in the value of the 'java-vm-args' attribute. Any comments? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: netx-jnlp-java-node.patch Type: text/x-patch Size: 4794 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090513/0f6b8fc5/netx-jnlp-java-node.patch From gnu_andrew at member.fsf.org Wed May 13 13:03:35 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 13 May 2009 21:03:35 +0100 Subject: FOSDEM 2009: OpenJDK Community Priorities Message-ID: <17c6771e0905131303g6f43ee08o82054e03fb0dcf42@mail.gmail.com> Dear all, As you may know, I recorded some of the talks that took place at FOSDEM this year. For the talks by individual speakers, I've been clearing these with those involved on a case-by-case basis and publishing them when possible. On the Sunday afternoon, we had a discussion talk led by Dalibor on 'OpenJDK Community Priorities'. Unfortunately, we didn't give any explicit warning beforehand that this was been recorded (as we have with the conference calls) and I'm in two minds as to whether we should publish this at all. I've been able to work out who most of the contributors are and these are listed below. If you were there (and especially if you contributed to the discussion) and don't want it published for whatever reason, please let me know ASAP. As far as I can work out, the talk runs like this: * First five minutes: Introduction by Dalibor * Dalibor asks for views from others involved in organising FOSDEM 09's Free Java talks: * Andrew Haley: 'faster, wider, deeper', Gary Benson contributes further to the discussion on IcedTea patches * Myself * Mark Wielaard * Mark Reinhold * Further questions: * Christian Thalinger (twisti) * Someone asks Mark Reinhold about having a website to which to upload patches -- not sure who this is * Terrence Barr I'll wait at least a week before taking any further action on this. -- 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 xerxes at zafena.se Wed May 13 13:14:16 2009 From: xerxes at zafena.se (=?UTF-8?B?WGVyeGVzIFLDpW5ieQ==?=) Date: Wed, 13 May 2009 22:14:16 +0200 Subject: FOSDEM 2009: OpenJDK Community Priorities In-Reply-To: <17c6771e0905131303g6f43ee08o82054e03fb0dcf42@mail.gmail.com> References: <17c6771e0905131303g6f43ee08o82054e03fb0dcf42@mail.gmail.com> Message-ID: <4A0B2A18.60000@zafena.se> Andrew John Hughes skrev: > Dear all, > > As you may know, I recorded some of the talks that took place at > FOSDEM this year. For the talks by individual speakers, I've been > clearing these with those involved on a case-by-case basis and > publishing them when possible. > > On the Sunday afternoon, we had a discussion talk led by Dalibor on > 'OpenJDK Community Priorities'. Unfortunately, we didn't give any > explicit warning beforehand that this was been recorded (as we have > with the conference calls) and I'm in two minds as to whether we > should publish this at all. I've been able to work out who most of > the contributors are and these are listed below. If you were there > (and especially if you contributed to the discussion) and don't want > it published for whatever reason, please let me know ASAP. > > As far as I can work out, the talk runs like this: > > * First five minutes: Introduction by Dalibor > * Dalibor asks for views from others involved in organising FOSDEM > 09's Free Java talks: > * Andrew Haley: 'faster, wider, deeper', Gary Benson contributes > further to the discussion on IcedTea patches > * Myself > * Mark Wielaard > * Mark Reinhold > * Further questions: > * Christian Thalinger (twisti) > * Someone asks Mark Reinhold about having a website to which to > upload patches -- not sure who this is > I feel responsible for stating the website patch upload question. I am totally fine for it to be published. > * Terrence Barr > > I'll wait at least a week before taking any further action on this. > Cheers and have a great day. Xerxes From mr at sun.com Wed May 13 13:59:10 2009 From: mr at sun.com (Mark Reinhold) Date: Wed, 13 May 2009 13:59:10 -0700 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: mark@klomp.org; Wed, 13 May 2009 09:44:22 +0200; <1242200662.3636.6.camel@hermans.wildebeest.org> Message-ID: <20090513205910.247D95CE0@eggemoggin.niobe.net> > Date: Wed, 13 May 2009 09:44:22 +0200 > From: Mark Wielaard > On Wed, 2009-05-06 at 08:09 -0700, Mark Reinhold wrote: >> In order to move this forward, I'll go ahead and create the proposed >> forests on hg.openjdk.java.net. > > Thanks, how are they called and are they already populated? http://hg.openjdk.java.net/hsx/hsx14/baseline http://hg.openjdk.java.net/hsx/hsx14/master (I don't know why the tip changeset in each of these repos is labeled "6836332: Bump Hotspot 14 build number to 15", which seems odd.) >> In the fullness of time I still think there's value in having a HotSpot >> Express Project. Those of us who've been involved in this discussion >> will understand what's going on, but it'd be good to have an obvious >> place where people new to the topic can find documentation. > > There was a vote started to create a separate express project, but then > aborted because of procedural issues (wrong mailinglist). It is unclear > whether or not the project creation is stuck now. Not aborted, just delayed. Dalibor is assisting. - Mark From mr at sun.com Wed May 13 14:05:29 2009 From: mr at sun.com (Mark Reinhold) Date: Wed, 13 May 2009 14:05:29 -0700 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: mr@sun.com; Wed, 13 May 2009 13:59:10 PDT; <20090513205910.247D95CE0@eggemoggin.niobe.net> Message-ID: <20090513210529.917DC5CE0@eggemoggin.niobe.net> > From: Mark Reinhold > Date: Wed, 13 May 2009 13:59:10 -0700 > ... > > http://hg.openjdk.java.net/hsx/hsx14/baseline > http://hg.openjdk.java.net/hsx/hsx14/master > > (I don't know why the tip changeset in each of these repos is labeled > "6836332: Bump Hotspot 14 build number to 15", which seems odd.) Duh, my confusion. It's just the build number (s/b14/b15/) rather than the HotSpot major version number, which remains at 14. Nevermind. - Mark From gnu_andrew at member.fsf.org Wed May 13 14:10:49 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 13 May 2009 22:10:49 +0100 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <20090513210529.917DC5CE0@eggemoggin.niobe.net> References: <20090513205910.247D95CE0@eggemoggin.niobe.net> <20090513210529.917DC5CE0@eggemoggin.niobe.net> Message-ID: <17c6771e0905131410n37a8723bq2dcb3e20eded5064@mail.gmail.com> 2009/5/13 Mark Reinhold : >> From: Mark Reinhold >> Date: Wed, 13 May 2009 13:59:10 -0700 > >> ... >> >> http://hg.openjdk.java.net/hsx/hsx14/baseline >> http://hg.openjdk.java.net/hsx/hsx14/master >> >> (I don't know why the tip changeset in each of these repos is labeled >> ?"6836332: Bump Hotspot 14 build number to 15", which seems odd.) > > Duh, my confusion. ?It's just the build number (s/b14/b15/) rather than > the HotSpot major version number, which remains at 14. > > Nevermind. > > - Mark > Hurrah!!!! -- 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 Erik.Trimble at Sun.COM Wed May 13 14:58:43 2009 From: Erik.Trimble at Sun.COM (Erik Trimble) Date: Wed, 13 May 2009 14:58:43 -0700 Subject: How to host HS14 stable? (Was: RFC: Change name of default HotSpot to 'default') In-Reply-To: <20090513205910.247D95CE0@eggemoggin.niobe.net> References: <20090513205910.247D95CE0@eggemoggin.niobe.net> Message-ID: <4A0B4293.8060800@sun.com> Mark Reinhold wrote: >> Date: Wed, 13 May 2009 09:44:22 +0200 >> From: Mark Wielaard >> > > >> On Wed, 2009-05-06 at 08:09 -0700, Mark Reinhold wrote: >> >>> In order to move this forward, I'll go ahead and create the proposed >>> forests on hg.openjdk.java.net. >>> >> Thanks, how are they called and are they already populated? >> > > http://hg.openjdk.java.net/hsx/hsx14/baseline > http://hg.openjdk.java.net/hsx/hsx14/master > > (I don't know why the tip changeset in each of these repos is labeled > "6836332: Bump Hotspot 14 build number to 15", which seems odd.) > > Because it's a bump in the BUILD number, not the VERSION number. I.e. Hotspot Express 14 build 15. java -version should thus report '14.0 b15' Also, we're not tagging anymore. That's a completely different discussion. :-) >>> In the fullness of time I still think there's value in having a HotSpot >>> Express Project. Those of us who've been involved in this discussion >>> will understand what's going on, but it'd be good to have an obvious >>> place where people new to the topic can find documentation. >>> >> There was a vote started to create a separate express project, but then >> aborted because of procedural issues (wrong mailinglist). It is unclear >> whether or not the project creation is stuck now. >> > > Not aborted, just delayed. Dalibor is assisting. > > - Mark > The vote is on-going. -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA Timezone: US/Pacific (GMT-0800) From gnu_andrew at member.fsf.org Wed May 13 16:22:35 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 14 May 2009 00:22:35 +0100 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 Message-ID: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> 2009-05-14 Andrew John Hughes * Makefile.am: Use HotSpot from the new HotSpot Express master repository. * hotspot.map: Bump changeset and md5sum to hs14b15. $ /home/andrew/build/icedtea6/bin/java -version java version "1.6.0_0" OpenJDK Runtime Environment (IcedTea6 1.5pre-r50c172a7a7f4) (build 1.6.0_0-b16) OpenJDK 64-Bit Server VM (build 14.0-b15, mixed mode) Patch attached. OK for icedtea6 tip? (Eager users can grab this from 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 -------------- next part -------------- diff -r 50c172a7a7f4 Makefile.am --- a/Makefile.am Wed May 13 15:36:33 2009 -0400 +++ b/Makefile.am Thu May 14 00:14:14 2009 +0100 @@ -276,7 +276,7 @@ # Download OpenJDK sources. OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/ +HOTSPOT_URL = http://hg.openjdk.java.net/hsx/hsx14/master/archive/ OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6 if USE_ALT_OPENJDK_SRC_ZIP @@ -658,8 +658,8 @@ if ! test -d openjdk/hotspot ; \ then \ $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \ - chmod -R ug+w hotspot-* ; \ - mv hotspot-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \ + chmod -R ug+w master-* ; \ + mv master-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \ $(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \ fi ; \ fi diff -r 50c172a7a7f4 hotspot.map --- a/hotspot.map Wed May 13 15:36:33 2009 -0400 +++ b/hotspot.map Thu May 14 00:14:14 2009 +0100 @@ -1,2 +1,3 @@ # version changeset md5sum -default fc6a5ae3fef5 1c3510387dccdb4907d0fd2f1c58e372 +default 25a020f13592 dbd7aca5544d1aeebf0eadd45d29d08e + From Peter.Zhelezniakov at Sun.COM Thu May 14 01:14:06 2009 From: Peter.Zhelezniakov at Sun.COM (Peter Zhelezniakov) Date: Thu, 14 May 2009 12:14:06 +0400 Subject: Upcoming changes to JDK7 build process: JIBX In-Reply-To: <17c6771e0905130620p2eab5690xdf46f172dabfc65a@mail.gmail.com> References: <49EC549A.5090505@Sun.com> <49FEC773.90601@Sun.com> <17c6771e0905130520q1acac076qc8671f990a3e279d@mail.gmail.com> <4A0ABE06.4030204@Sun.com> <17c6771e0905130546w48d9603bme55477d7229ed8e9@mail.gmail.com> <4A0AC722.2060105@Sun.com> <17c6771e0905130620p2eab5690xdf46f172dabfc65a@mail.gmail.com> Message-ID: <4A0BD2CE.1020001@Sun.com> Andrew John Hughes wrote: > Do you know if there is a symbol or similar which reports the current version? You mean in JIBX? I cannot see any in 1.1.5. There's some class org.jibx.runtime.PrintInfo, but it appeared in a later version, and is barely documented. -- Peter From doko at ubuntu.com Thu May 14 01:37:18 2009 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 14 May 2009 10:37:18 +0200 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> Message-ID: <4A0BD83E.5030701@ubuntu.com> Andrew John Hughes schrieb: > 2009-05-14 Andrew John Hughes > > * Makefile.am: > Use HotSpot from the new HotSpot Express > master repository. > * hotspot.map: > Bump changeset and md5sum to hs14b15. > > > $ /home/andrew/build/icedtea6/bin/java -version > java version "1.6.0_0" > OpenJDK Runtime Environment (IcedTea6 1.5pre-r50c172a7a7f4) (build 1.6.0_0-b16) > OpenJDK 64-Bit Server VM (build 14.0-b15, mixed mode) > > Patch attached. OK for icedtea6 tip? could you send test results, and diffs against our current version? From mark at klomp.org Thu May 14 01:44:18 2009 From: mark at klomp.org (Mark Wielaard) Date: Thu, 14 May 2009 10:44:18 +0200 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> Message-ID: <1242290659.24669.1.camel@hermans.wildebeest.org> Hi Andrew, On Thu, 2009-05-14 at 00:22 +0100, Andrew John Hughes wrote: > 2009-05-14 Andrew John Hughes > > * Makefile.am: > Use HotSpot from the new HotSpot Express > master repository. > * hotspot.map: > Bump changeset and md5sum to hs14b15. > > > $ /home/andrew/build/icedtea6/bin/java -version > java version "1.6.0_0" > OpenJDK Runtime Environment (IcedTea6 1.5pre-r50c172a7a7f4) (build 1.6.0_0-b16) > OpenJDK 64-Bit Server VM (build 14.0-b15, mixed mode) > > Patch attached. OK for icedtea6 tip? Nice minimal patch. Thanks for doing this. Please do also mention this in the NEWS file. And document to upgrade procedure (where to get the hg-rev and md5sum) in the HACKING guide. Cheers, Mark From gnu_andrew at member.fsf.org Thu May 14 02:20:20 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 14 May 2009 10:20:20 +0100 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <4A0BD83E.5030701@ubuntu.com> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <4A0BD83E.5030701@ubuntu.com> Message-ID: <17c6771e0905140220m757509f7w4bdb8a46fd332bf8@mail.gmail.com> 2009/5/14 Matthias Klose : > Andrew John Hughes schrieb: >> 2009-05-14 ?Andrew John Hughes ? >> >> ? ? ? * Makefile.am: >> ? ? ? Use HotSpot from the new HotSpot Express >> ? ? ? master repository. >> ? ? ? * hotspot.map: >> ? ? ? Bump changeset and md5sum to hs14b15. >> >> >> ?$ /home/andrew/build/icedtea6/bin/java -version >> java version "1.6.0_0" >> OpenJDK Runtime Environment (IcedTea6 1.5pre-r50c172a7a7f4) (build 1.6.0_0-b16) >> OpenJDK 64-Bit Server VM (build 14.0-b15, mixed mode) >> >> Patch attached. ?OK for icedtea6 tip? > > could you send test results, and diffs against our current version? > > Changes are here: http://hg.openjdk.java.net/hsx/hsx14/master I don't have test results but feel free to run some. -- 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 May 14 02:21:59 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 14 May 2009 10:21:59 +0100 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <1242290659.24669.1.camel@hermans.wildebeest.org> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <1242290659.24669.1.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905140221rc46d6b3w66b7431356f7e8eb@mail.gmail.com> 2009/5/14 Mark Wielaard : > Hi Andrew, > > On Thu, 2009-05-14 at 00:22 +0100, Andrew John Hughes wrote: >> 2009-05-14 ?Andrew John Hughes ? >> >> ? ? ? * Makefile.am: >> ? ? ? Use HotSpot from the new HotSpot Express >> ? ? ? master repository. >> ? ? ? * hotspot.map: >> ? ? ? Bump changeset and md5sum to hs14b15. >> >> >> ?$ /home/andrew/build/icedtea6/bin/java -version >> java version "1.6.0_0" >> OpenJDK Runtime Environment (IcedTea6 1.5pre-r50c172a7a7f4) (build 1.6.0_0-b16) >> OpenJDK 64-Bit Server VM (build 14.0-b15, mixed mode) >> >> Patch attached. ?OK for icedtea6 tip? > > Nice minimal patch. Thanks for doing this. > > Please do also mention this in the NEWS file. Good point. And document to upgrade > procedure (where to get the hg-rev and md5sum) in the HACKING guide. > I would think this is fairly self-explanatory but ok. > Cheers, > > Mark > > -- 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 mark at klomp.org Thu May 14 02:42:05 2009 From: mark at klomp.org (Mark Wielaard) Date: Thu, 14 May 2009 11:42:05 +0200 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <17c6771e0905140221rc46d6b3w66b7431356f7e8eb@mail.gmail.com> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <1242290659.24669.1.camel@hermans.wildebeest.org> <17c6771e0905140221rc46d6b3w66b7431356f7e8eb@mail.gmail.com> Message-ID: <1242294125.24669.7.camel@hermans.wildebeest.org> On Thu, 2009-05-14 at 10:21 +0100, Andrew John Hughes wrote: > > And document to upgrade > > procedure (where to get the hg-rev and md5sum) in the HACKING guide. > > > I would think this is fairly self-explanatory but ok. Yeah, I know, but that is what I think about my own little patches and build tweaks all the time :) So please do also ask me if I seem to add something that is "trivial" without adding a little documentation blurb. Cheers, Mark From gnu_andrew at member.fsf.org Thu May 14 03:22:56 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 14 May 2009 11:22:56 +0100 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <1242294125.24669.7.camel@hermans.wildebeest.org> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <1242290659.24669.1.camel@hermans.wildebeest.org> <17c6771e0905140221rc46d6b3w66b7431356f7e8eb@mail.gmail.com> <1242294125.24669.7.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905140322k56aa35eeqde3a06e9a46be64e@mail.gmail.com> 2009/5/14 Mark Wielaard : > On Thu, 2009-05-14 at 10:21 +0100, Andrew John Hughes wrote: >> > And document to upgrade >> > procedure (where to get the hg-rev and md5sum) in the HACKING guide. >> > >> I would think this is fairly self-explanatory but ok. > > Yeah, I know, but that is what I think about my own little patches and > build tweaks all the time :) So please do also ask me if I seem to add > something that is "trivial" without adding a little documentation blurb. > > Cheers, > > Mark > > Here goes: 2009-05-14 Andrew John Hughes * INSTALL: Add notes on using alternate HotSpot builds. * NEWS: Mention HotSpot bump. -- 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 -------------- next part -------------- diff -r 30d0a78a8748 INSTALL --- a/INSTALL Thu May 14 00:18:21 2009 +0100 +++ b/INSTALL Thu May 14 11:22:28 2009 +0100 @@ -128,3 +128,42 @@ 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-'. + +Support for different versions of HotSpot +----------------------------------------- + +IcedTea allows the version of HotSpot provided with the upstream build +drop to be replaced with another. Support this is provided by the +--with-hotspot-build option which causes IcedTea to probe the +hotspot.map file for an entry with the given build name. The +hotspot.map file maps the name to a changeset from the repository +http://hg.openjdk.java.net/hsx/hsx14/master/ which it downloads from +http://hg.openjdk.java.net/hsx/hsx14/master/archive/${CHANGESET}.tar.gz. +The resulting download is verified using the MD5 sum stored in +hotspot.map. + +New build selections may be provided by providing further mappings in +the hotspot.map file. The name can be anything +e.g. 'shiny_new_hotspot'. This is simply used to map the argument to +--with-hotspot-build to the values in the file and to apply +appropriate patches (see patches/hotspot, $HSBUILD is available in +Makefile.am for obtaining the build name). The special value +'original' is used to denote the upstream HotSpot and does not appear +in hotspot.map. The changeset should map a valid changeset in the +HotSpot Express master repository (URL shown above). These can be +obtained from a local checkout or using the web interface. The +simplest way to calculate the MD5 sum is to download the tarball and +then run the 'md5sum' application on it. The resulting value should +be added to hotspot.map. + +As with the OpenJDK build tarballs, the location of an alternate zip +can be specified using --with-hotspot-src-zip. This skips the +download stage and just verifies that the zip's MD5 sum matches that +of the requested build. + +At present, the build name 'default' is used in hotspot.map to provide +the latest version of HotSpot 14 in place of the version of HotSpot 11 +provided by upstream. Thus, --with-hotspot-build is enabled by +default, and either --without-hotspot-build or +--with-hotspot-build=original is required to revert to the upstream +HotSpot. diff -r 30d0a78a8748 NEWS --- a/NEWS Thu May 14 00:18:21 2009 +0100 +++ b/NEWS Thu May 14 11:22:28 2009 +0100 @@ -1,4 +1,4 @@ -New in release 1.X (UNRELEASED) +New in release 1.5 (UNRELEASED) - Static trace support through systemtap. When given the configure option --enable-systemtap IcedTea will build @@ -10,6 +10,8 @@ virtual machines on architectures where hotspot is available are cacao and zero (or shark), and cacao, where zero (or shark) is available. It's not possible to build cacao as the default VM, and zero as additional VM. +- Update to latest HotSpot minor build (hs14b10-->hs14b15) from the new + HotSpot Express repository. New in release 1.4 (2009-01-29) From gnu_andrew at member.fsf.org Thu May 14 04:22:13 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 14 May 2009 12:22:13 +0100 Subject: Caciocavallo! Message-ID: <17c6771e0905140422m36c0a4a9ka1f6527366add542@mail.gmail.com> Now available for your viewing pleasure: http://www.archive.org/details/fosdem_2009_free_java_caciocavallo http://gnuandrew.blip.tv/file/2109528/ Thanks to Roman & Mario. -- 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 mark at klomp.org Thu May 14 04:45:08 2009 From: mark at klomp.org (Mark Wielaard) Date: Thu, 14 May 2009 13:45:08 +0200 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <4A0BD83E.5030701@ubuntu.com> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <4A0BD83E.5030701@ubuntu.com> Message-ID: <1242301508.2762.5.camel@hermans.wildebeest.org> Hi Matthias, On Thu, 2009-05-14 at 10:37 +0200, Matthias Klose wrote: > could you send test results, and diffs against our current version? I see no failures with the new hotspot (*) against make check-hotspot: Test results: passed: 24 And check-langtools: Test results: passed: 1,352 The make check-jdk crashed my X-server, although that is clearly a bug in the server. I'll try and rerun those tests and upload the JTReports if the succeed. Cheers, Mark (*) java version "1.6.0_0" OpenJDK Runtime Environment (IcedTea6 1.5pre-r50c172a7a7f4) (build 1.6.0_0-b16) OpenJDK 64-Bit Server VM (build 14.0-b15, mixed mode) From Terrence.Barr at Sun.COM Thu May 14 01:12:28 2009 From: Terrence.Barr at Sun.COM (Terrence Barr - Senior Technologist and Ambassador) Date: Thu, 14 May 2009 10:12:28 +0200 Subject: FOSDEM 2009: OpenJDK Community Priorities In-Reply-To: <17c6771e0905131303g6f43ee08o82054e03fb0dcf42@mail.gmail.com> References: <17c6771e0905131303g6f43ee08o82054e03fb0dcf42@mail.gmail.com> Message-ID: <4A0BD26C.5020408@sun.com> Andrew, Publication is fine by me. -- Terrence Andrew John Hughes wrote: > Dear all, > > As you may know, I recorded some of the talks that took place at > FOSDEM this year. For the talks by individual speakers, I've been > clearing these with those involved on a case-by-case basis and > publishing them when possible. > > On the Sunday afternoon, we had a discussion talk led by Dalibor on > 'OpenJDK Community Priorities'. Unfortunately, we didn't give any > explicit warning beforehand that this was been recorded (as we have > with the conference calls) and I'm in two minds as to whether we > should publish this at all. I've been able to work out who most of > the contributors are and these are listed below. If you were there > (and especially if you contributed to the discussion) and don't want > it published for whatever reason, please let me know ASAP. > > As far as I can work out, the talk runs like this: > > * First five minutes: Introduction by Dalibor > * Dalibor asks for views from others involved in organising FOSDEM > 09's Free Java talks: > * Andrew Haley: 'faster, wider, deeper', Gary Benson contributes > further to the discussion on IcedTea patches > * Myself > * Mark Wielaard > * Mark Reinhold > * Further questions: > * Christian Thalinger (twisti) > * Someone asks Mark Reinhold about having a website to which to > upload patches -- not sure who this is > * Terrence Barr > > I'll wait at least a week before taking any further action on this. -- Terrence Barr Senior Technologist and Community Ambassador Java Mobile & Embedded Community Phone: +49 711 720 98185 Yahoo: terrencebarr, AIM: terrencebarr123 http://www.mobileandembedded.org http://www.sun.com Registered Office/Sitz der Gesellschaft: Sun Microsystems GmbH, Sonnenallee 1, D-85551 Kirchheim-Heimstetten Amtsgericht Muenchen: HRB 161028 Geschaeftsfuehrer: Thomas Schroeder, Wolfgang Engels, Wolf Frenkel Vorsitzender des Aufsichtsrates: Martin Haering NOTICE: This email message is for the sole use of the intended recipient(s) and may contain confidential and privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -------------- next part -------------- A non-text attachment was scrubbed... Name: terrence_barr.vcf Type: text/x-vcard Size: 313 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090514/8c45ec80/terrence_barr.vcf From langel at redhat.com Thu May 14 07:26:31 2009 From: langel at redhat.com (Lillian Angel) Date: Thu, 14 May 2009 10:26:31 -0400 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <17c6771e0905140322k56aa35eeqde3a06e9a46be64e@mail.gmail.com> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <1242290659.24669.1.camel@hermans.wildebeest.org> <17c6771e0905140221rc46d6b3w66b7431356f7e8eb@mail.gmail.com> <1242294125.24669.7.camel@hermans.wildebeest.org> <17c6771e0905140322k56aa35eeqde3a06e9a46be64e@mail.gmail.com> Message-ID: <4A0C2A17.3040800@redhat.com> Andrew John Hughes wrote: > 2009/5/14 Mark Wielaard : > >> On Thu, 2009-05-14 at 10:21 +0100, Andrew John Hughes wrote: >> >>>> And document to upgrade >>>> procedure (where to get the hg-rev and md5sum) in the HACKING guide. >>>> >>>> >>> I would think this is fairly self-explanatory but ok. >>> >> Yeah, I know, but that is what I think about my own little patches and >> build tweaks all the time :) So please do also ask me if I seem to add >> something that is "trivial" without adding a little documentation blurb. >> >> Cheers, >> >> Mark >> >> >> > > Here goes: > > 2009-05-14 Andrew John Hughes > > * INSTALL: > Add notes on using alternate HotSpot builds. > * NEWS: > Mention HotSpot bump. Looks good to me. Lillian From langel at redhat.com Thu May 14 07:45:28 2009 From: langel at redhat.com (Lillian Angel) Date: Thu, 14 May 2009 10:45:28 -0400 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <49FAFB05.5030509@redhat.com> References: <49FAFB05.5030509@redhat.com> Message-ID: <4A0C2E88.30800@redhat.com> Lillian Angel wrote: > Hi, > > I would like to have a release in the new future, which includes the > new b16 update and several important improvements to the plugin. > > Any objections or suggestions? Now that b16 and hotspot 14 have both been integrated into icedtea6, I think we are ready to go ahead with the 1.5 release. Is everyone ok if this happens early next week? Thanks, Lillian From gnu_andrew at member.fsf.org Thu May 14 08:08:58 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 14 May 2009 16:08:58 +0100 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <4A0C2A17.3040800@redhat.com> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <1242290659.24669.1.camel@hermans.wildebeest.org> <17c6771e0905140221rc46d6b3w66b7431356f7e8eb@mail.gmail.com> <1242294125.24669.7.camel@hermans.wildebeest.org> <17c6771e0905140322k56aa35eeqde3a06e9a46be64e@mail.gmail.com> <4A0C2A17.3040800@redhat.com> Message-ID: <17c6771e0905140808y4885a14fwbe37ef9c9f6a21b1@mail.gmail.com> 2009/5/14 Lillian Angel : > Andrew John Hughes wrote: >> >> 2009/5/14 Mark Wielaard : >> >>> >>> On Thu, 2009-05-14 at 10:21 +0100, Andrew John Hughes wrote: >>> >>>>> >>>>> And document to upgrade >>>>> procedure (where to get the hg-rev and md5sum) in the HACKING guide. >>>>> >>>>> >>>> >>>> I would think this is fairly self-explanatory but ok. >>>> >>> >>> Yeah, I know, but that is what I think about my own little patches and >>> build tweaks all the time :) So please do also ask me if I seem to add >>> something that is "trivial" without adding a little documentation blurb. >>> >>> Cheers, >>> >>> Mark >>> >>> >>> >> >> Here goes: >> >> 2009-05-14 ?Andrew John Hughes ? >> >> ? ? ? ?* INSTALL: >> ? ? ? ?Add notes on using alternate HotSpot builds. >> ? ? ? ?* NEWS: >> ? ? ? ?Mention HotSpot bump. > > > Looks good to me. > > Lillian > > Thanks. I'll push these now. -- 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 ahughes at redhat.com Thu May 14 08:08:28 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 14 May 2009 15:08:28 +0000 Subject: changeset in /hg/icedtea6: Use the new HS Express repository and... Message-ID: changeset 30d0a78a8748 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=30d0a78a8748 description: Use the new HS Express repository and hs14b15. 2009-05-14 Andrew John Hughes * Makefile.am: Use HotSpot from the new HotSpot Express master repository. * hotspot.map: Bump changeset and md5sum to hs14b15. diffstat: 3 files changed, 13 insertions(+), 4 deletions(-) ChangeLog | 8 ++++++++ Makefile.am | 6 +++--- hotspot.map | 3 ++- diffs (46 lines): diff -r 50c172a7a7f4 -r 30d0a78a8748 ChangeLog --- a/ChangeLog Wed May 13 15:36:33 2009 -0400 +++ b/ChangeLog Thu May 14 00:18:21 2009 +0100 @@ -1,3 +1,11 @@ 2009-05-13 Omair Majid + + * Makefile.am: + Use HotSpot from the new HotSpot Express + master repository. + * hotspot.map: + Bump changeset and md5sum to hs14b15. + 2009-05-13 Omair Majid * rt/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. This new class diff -r 50c172a7a7f4 -r 30d0a78a8748 Makefile.am --- a/Makefile.am Wed May 13 15:36:33 2009 -0400 +++ b/Makefile.am Thu May 14 00:18:21 2009 +0100 @@ -276,7 +276,7 @@ snapshot: dist # Download OpenJDK sources. OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/ +HOTSPOT_URL = http://hg.openjdk.java.net/hsx/hsx14/master/archive/ OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6 if USE_ALT_OPENJDK_SRC_ZIP @@ -658,8 +658,8 @@ if WITH_ALT_HSBUILD if ! test -d openjdk/hotspot ; \ then \ $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \ - chmod -R ug+w hotspot-* ; \ - mv hotspot-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \ + chmod -R ug+w master-* ; \ + mv master-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \ $(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \ fi ; \ fi diff -r 50c172a7a7f4 -r 30d0a78a8748 hotspot.map --- a/hotspot.map Wed May 13 15:36:33 2009 -0400 +++ b/hotspot.map Thu May 14 00:18:21 2009 +0100 @@ -1,2 +1,3 @@ # version changeset md5sum -default fc6a5ae3fef5 1c3510387dccdb4907d0fd2f1c58e372 +default 25a020f13592 dbd7aca5544d1aeebf0eadd45d29d08e + From ahughes at redhat.com Thu May 14 08:08:28 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 14 May 2009 15:08:28 +0000 Subject: changeset in /hg/icedtea6: Add documentation updates for HotSpot... Message-ID: changeset e494e30ec272 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e494e30ec272 description: Add documentation updates for HotSpot builds. 2009-05-14 Andrew John Hughes * INSTALL: Add notes on using alternate HotSpot builds. * NEWS: Mention HotSpot bump. diffstat: 3 files changed, 49 insertions(+), 1 deletion(-) ChangeLog | 7 +++++++ INSTALL | 39 +++++++++++++++++++++++++++++++++++++++ NEWS | 4 +++- diffs (78 lines): diff -r 30d0a78a8748 -r e494e30ec272 ChangeLog --- a/ChangeLog Thu May 14 00:18:21 2009 +0100 +++ b/ChangeLog Thu May 14 11:24:13 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-14 Andrew John Hughes + + * INSTALL: + Add notes on using alternate HotSpot builds. + * NEWS: + Mention HotSpot bump. + 2009-05-14 Andrew John Hughes * Makefile.am: diff -r 30d0a78a8748 -r e494e30ec272 INSTALL --- a/INSTALL Thu May 14 00:18:21 2009 +0100 +++ b/INSTALL Thu May 14 11:24:13 2009 +0100 @@ -128,3 +128,42 @@ The additional VM's are available by cal 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-'. + +Support for different versions of HotSpot +----------------------------------------- + +IcedTea allows the version of HotSpot provided with the upstream build +drop to be replaced with another. Support this is provided by the +--with-hotspot-build option which causes IcedTea to probe the +hotspot.map file for an entry with the given build name. The +hotspot.map file maps the name to a changeset from the repository +http://hg.openjdk.java.net/hsx/hsx14/master/ which it downloads from +http://hg.openjdk.java.net/hsx/hsx14/master/archive/${CHANGESET}.tar.gz. +The resulting download is verified using the MD5 sum stored in +hotspot.map. + +New build selections may be provided by providing further mappings in +the hotspot.map file. The name can be anything +e.g. 'shiny_new_hotspot'. This is simply used to map the argument to +--with-hotspot-build to the values in the file and to apply +appropriate patches (see patches/hotspot, $HSBUILD is available in +Makefile.am for obtaining the build name). The special value +'original' is used to denote the upstream HotSpot and does not appear +in hotspot.map. The changeset should map a valid changeset in the +HotSpot Express master repository (URL shown above). These can be +obtained from a local checkout or using the web interface. The +simplest way to calculate the MD5 sum is to download the tarball and +then run the 'md5sum' application on it. The resulting value should +be added to hotspot.map. + +As with the OpenJDK build tarballs, the location of an alternate zip +can be specified using --with-hotspot-src-zip. This skips the +download stage and just verifies that the zip's MD5 sum matches that +of the requested build. + +At present, the build name 'default' is used in hotspot.map to provide +the latest version of HotSpot 14 in place of the version of HotSpot 11 +provided by upstream. Thus, --with-hotspot-build is enabled by +default, and either --without-hotspot-build or +--with-hotspot-build=original is required to revert to the upstream +HotSpot. diff -r 30d0a78a8748 -r e494e30ec272 NEWS --- a/NEWS Thu May 14 00:18:21 2009 +0100 +++ b/NEWS Thu May 14 11:24:13 2009 +0100 @@ -1,4 +1,4 @@ New in release 1.X (UNRELEASED) -New in release 1.X (UNRELEASED) +New in release 1.5 (UNRELEASED) - Static trace support through systemtap. When given the configure option --enable-systemtap IcedTea will build @@ -10,6 +10,8 @@ New in release 1.X (UNRELEASED) virtual machines on architectures where hotspot is available are cacao and zero (or shark), and cacao, where zero (or shark) is available. It's not possible to build cacao as the default VM, and zero as additional VM. +- Update to latest HotSpot minor build (hs14b10-->hs14b15) from the new + HotSpot Express repository. New in release 1.4 (2009-01-29) From dbhole at redhat.com Thu May 14 08:56:55 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 14 May 2009 11:56:55 -0400 Subject: RFC: Add support for 'java' tag and it's attributes in NetX In-Reply-To: <4A0B271F.2050904@redhat.com> References: <4A0B271F.2050904@redhat.com> Message-ID: <20090514155655.GA13416@redhat.com> * Omair Majid [2009-05-13 16:05]: > Hi, > > JNLP 6 allows using the 'java' element inside a jnlp file instead of > 'j2se'. This patch allows NetX to treat the 'java' element as if it were > a 'j2se' element. AFAIK, NetX doesnt do anything with this yet. This > patch also makes NetX read and parse the 'java-vm-args' attribute of the > java/j2se tag. Just like 'initial-heap-size' and 'max-heap-size', this > is not used anywhere by NetX. > > ChangeLog: > 2009-05-13 Omair Majid > > * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to > reflect that the element can be either 'java' or 'j2se'. > * rt/net/sourceforge/jnlp/JREDesc.java: Fix comment to reflect a > 'java' element. New private variable vmArgs to keep track of > 'java-vm-args'. > (JREDesc): Modify to take in an additional parameter vmArgs and > store it in vmArgs. > (getVMArgs): New function. Return the value of 'java-vm-args' > attribute. > * rt/net/sourceforge/jnlp/Parser.java: Fix comments to reflect > either a 'java' or 'j2se' element. > (getResourceDesc): Treat 'java' element identically to 'j2se' > element. > (getJRE): Read in the value of the 'java-vm-args' attribute. > > Any comments? > Oops.. just noticed I hit reply instead of reply all this morning when I replied to this. Resending: Looks good. Go ahead and apply. While you are looking into that area of the code, can you also look at how to implement use of those arguments (not urgent)? Cheers, Deepak From aph at redhat.com Thu May 14 09:05:01 2009 From: aph at redhat.com (Andrew Haley) Date: Thu, 14 May 2009 17:05:01 +0100 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <4A0C2E88.30800@redhat.com> References: <49FAFB05.5030509@redhat.com> <4A0C2E88.30800@redhat.com> Message-ID: <4A0C412D.2080205@redhat.com> Lillian Angel wrote: > Lillian Angel wrote: >> I would like to have a release in the new future, which includes the >> new b16 update and several important improvements to the plugin. >> >> Any objections or suggestions? > > Now that b16 and hotspot 14 have both been integrated into icedtea6, I > think we are ready to go ahead with the 1.5 release. > > Is everyone ok if this happens early next week? Yes, assuming no TCK regressions. Andrew. From gnu_andrew at member.fsf.org Thu May 14 10:56:36 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 14 May 2009 18:56:36 +0100 Subject: XRender Java2D Pipeline Message-ID: <17c6771e0905141056v74705c99v2559f4c23c4937ed@mail.gmail.com> New FOSDEM 2009 video: http://www.archive.org/details/fosdem_2009_free_java_xrender http://gnuandrew.blip.tv/file/2113070/ Thanks to Clemens Eisserer. -- 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 mark at klomp.org Thu May 14 13:44:42 2009 From: mark at klomp.org (Mark Wielaard) Date: Thu, 14 May 2009 22:44:42 +0200 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <1242301508.2762.5.camel@hermans.wildebeest.org> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <4A0BD83E.5030701@ubuntu.com> <1242301508.2762.5.camel@hermans.wildebeest.org> Message-ID: <1242333882.8315.26.camel@hermans.wildebeest.org> On Thu, 2009-05-14 at 13:45 +0200, Mark Wielaard wrote: > On Thu, 2009-05-14 at 10:37 +0200, Matthias Klose wrote: > > could you send test results, and diffs against our current version? > > I see no failures with the new hotspot (*) against make check-hotspot: > Test results: passed: 24 > And check-langtools: > Test results: passed: 1,352 > The make check-jdk crashed my X-server, although that is clearly a bug > in the server. I'll try and rerun those tests and upload the JTReports > if the succeed. Upgraded my kernel. I suspect this was the new kernel mode-setting stuff. One of the AWT tests tries to switch resolution a lot. But sadly I forgot to save the logs, so I don't really know what was going on. The make check-jdk results look pretty OK: --------------- jtreg console summary for jdk --------------- FAILED: com/sun/net/httpserver/bugs/B6361557.java FAILED: java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java FAILED: java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html FAILED: java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html FAILED: java/awt/print/PrinterJob/ExceptionTest.java FAILED: java/awt/PrintJob/MultipleEnd/MultipleEnd.java FAILED: java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html FAILED: java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java FAILED: java/beans/XMLEncoder/javax_swing_tree_TreePath.java FAILED: java/net/InetAddress/GetLocalHostWithSM.java FAILED: java/net/MulticastSocket/SetLoopbackMode.java FAILED: java/net/MulticastSocket/Test.java FAILED: java/util/logging/LoggingDeadlock2.java FAILED: javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java FAILED: javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java Error: sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html FAILED: sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java FAILED: sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java FAILED: sun/java2d/cmm/ColorConvertOp/MTColConvTest.java Error: sun/java2d/OpenGL/GradientPaints.java FAILED: sun/rmi/transport/proxy/EagerHttpFallback.java Test results: passed: 3,334; failed: 19; error: 2 I haven't looked into the remaining failures. I suspect the java/net ones are because the machine didn't had a hostname setup yet and the default strict iptables settings. It looks like all of gervill finally got merged in b16, I will go through our overlay and compare to see if that is why there are 2 failures. And hopefully merge that this weekend. Full details in the JTreport and JTwork directories uploaded at: http://icedtea.classpath.org/~mjw/jtreg/ > (*) > java version "1.6.0_0" > OpenJDK Runtime Environment (IcedTea6 1.5pre-r50c172a7a7f4) (build 1.6.0_0-b16) > OpenJDK 64-Bit Server VM (build 14.0-b15, mixed mode) From gnu_andrew at member.fsf.org Thu May 14 16:13:19 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 15 May 2009 00:13:19 +0100 Subject: quilt for patch management? In-Reply-To: <4A0AEDA4.7000002@gmx.net> References: <4A043697.9000501@gmx.net> <4A043B4B.7080606@redhat.com> <4A043C64.9070904@gmx.net> <4A044158.20909@redhat.com> <4A0AEDA4.7000002@gmx.net> Message-ID: <17c6771e0905141613n5d2b6d5eu762ba3b1d57e1185@mail.gmail.com> 2009/5/13 Robert Schuster : > Hi Andrew, > > Andrew Haley schrieb: >> >> OK. ?Why is it better to do >> >> patch -p0 < >> >> or >> >> quilt import -p0 > You do the import once and after that quilt maintains the list of > applied and not-applied patches. This allows going back and forth > between the various patches conveniently (push/pop). > >> I don't get it. ?Seriously, I'm baffled: how would it make any difference? > Updating patches could be done in a well described way. > >>> Furthermore how do you update a patch at the moment? Manually as well? >>> quilt has a refresh command for this. It basically works like a poor man >>> SCM sandbox. >> Updating patches is probably a bad thing. ?It makes more sense to apply >> the patch and your changes to pristine sources and regenerate. > Sure this is what it would be. But how is this done at the moment. What > steps are needed to do that on the command line? As I see this stuff > needs manual work. > I guess I (and it seems a few others) just don't grok how this would help and not introduce additional burden. I can see how it might be helpful if I need to stack up patches to apply to IcedTea as a whole. There's probably a case for Mercurial queues there in maintaining my own stack of pending patches I've sent to the list. I'm not sure if push and pop would be enough to manage it though. I may have three patches on the stack for instance and 1 and 3 get approved, but 2 is still waiting -- is this workable? For IcedTea generally, I just don't get it. The patches are applied at build time by users, not by developers. Any stack would somehow have to be available in every checkout, including tarballs, and we'd have to add an additional dependency on quilt. That only seems to hurt. > But finally the initial mail was more of a: "Hey, I know this little > tool to make work easier. We use it in OE in the same context. Should I > think about implementing it or not?" > > As it looks people don't want it. So I let it be. > It's worth bringing it up again, as this has been mentioned a few times in various forms - if not here, then on IRC. It really needs someone who uses it to explain why it's better than sliced bread though... :) > Regards > Robert > > -- 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 Fri May 15 07:06:05 2009 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 15 May 2009 16:06:05 +0200 Subject: Bump HotSpot to new HotSpot Express repository and hs14b15 In-Reply-To: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> Message-ID: <4A0D76CD.1020006@ubuntu.com> Andrew John Hughes schrieb: > 2009-05-14 Andrew John Hughes > > * Makefile.am: > Use HotSpot from the new HotSpot Express > master repository. > * hotspot.map: > Bump changeset and md5sum to hs14b15. please find attached some test results. On amd64 and i386 I don't see regressions with hotspot, one regression with zero on i386. The tests were run on a machine without internet access. Matthias -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-hotspot-amd64.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-hotspot-amd64.diff -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-hotspot-i386.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-hotspot-i386.diff -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-hs-zero-amd64.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-hs-zero-amd64.diff -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-hs-zero-i386.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-hs-zero-i386.diff -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-hotspot-amd64-hs14 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-hotspot-amd64-hs14.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-hotspot-amd64-old Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-hotspot-amd64-old.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-hotspot-i386-hs14 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-hotspot-i386-hs14.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-hotspot-i386-old Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-hotspot-i386-old.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-zero-amd64-hs14 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-zero-amd64-hs14.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-zero-amd64-old Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-zero-amd64-old.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-zero-i386-hs14 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-zero-i386-hs14.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-zero-i386-old Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-zero-i386-old.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-zero-ia64-old Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-zero-ia64-old.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-zero-powerpc-old Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-summary-zero-powerpc-old.ksh -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-zero-amd64.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-zero-amd64.diff -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-zero-i386.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/d1141f99/jtreg-zero-i386.diff From langel at redhat.com Fri May 15 09:37:34 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 16:37:34 +0000 Subject: changeset in /hg/icedtea6: 2009-05-15 Lillian Angel changeset 139d7ce58c09 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=139d7ce58c09 description: 2009-05-15 Lillian Angel * configure.ac: Bumped version. * NEWS: Updated for 1.5 release. diffstat: 3 files changed, 22 insertions(+), 2 deletions(-) ChangeLog | 5 +++++ NEWS | 17 ++++++++++++++++- configure.ac | 2 +- diffs (52 lines): diff -r e494e30ec272 -r 139d7ce58c09 ChangeLog --- a/ChangeLog Thu May 14 11:24:13 2009 +0100 +++ b/ChangeLog Fri May 15 12:38:31 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-14 Andrew John Hughes + + * configure.ac: Bumped version. + * NEWS: Updated for 1.5 release. + 2009-05-14 Andrew John Hughes * INSTALL: diff -r e494e30ec272 -r 139d7ce58c09 NEWS --- a/NEWS Thu May 14 11:24:13 2009 +0100 +++ b/NEWS Fri May 15 12:38:31 2009 -0400 @@ -1,4 +1,4 @@ New in release 1.5 (UNRELEASED) -New in release 1.5 (UNRELEASED) +ew in release 1.5 (2009-05-15) - Static trace support through systemtap. When given the configure option --enable-systemtap IcedTea will build @@ -12,6 +12,21 @@ New in release 1.5 (UNRELEASED) not possible to build cacao as the default VM, and zero as additional VM. - Update to latest HotSpot minor build (hs14b10-->hs14b15) from the new HotSpot Express repository. +- Updated to OpenJDK b16 build. +- Visual VM updated to 1.1.1. +- Several web browser plugin and javaws support fixes: + - Fixed security handling to prevent access denials when there is a site + specific exception in the policy file + - Allow extentions (chrome) to run Java code with full permissions + - Added non-trusted SSL support to WebStart (javaws) + - Added proxy support + - Other improvements that were breaking specific sites (tag parser fix, + nested jar support, etc.) + - Added JVM Console (used by http://chrispederick.com/work/web-developer/) +- LCMS security fixes. +- Many build improvements. +- Many java2d, nio2, pulse java, zero/shark, jtreg fixes. +- Other bug fixes. New in release 1.4 (2009-01-29) diff -r e494e30ec272 -r 139d7ce58c09 configure.ac --- a/configure.ac Thu May 14 11:24:13 2009 +0100 +++ b/configure.ac Fri May 15 12:38:31 2009 -0400 @@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.5pre], [distro-pk -AC_INIT([icedtea6], [1.5pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6], [1.5], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From langel at redhat.com Fri May 15 09:37:54 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 16:37:54 +0000 Subject: changeset in /hg/icedtea6: Added tag icedtea6-1.5 for changeset ... Message-ID: changeset 4679c32a34c9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4679c32a34c9 description: Added tag icedtea6-1.5 for changeset 139d7ce58c09 diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r 139d7ce58c09 -r 4679c32a34c9 .hgtags --- a/.hgtags Fri May 15 12:38:31 2009 -0400 +++ b/.hgtags Fri May 15 12:38:50 2009 -0400 @@ -12,3 +12,4 @@ be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 +139d7ce58c09d84003ffa75f5a99d2b1b469821a icedtea6-1.5 From langel at redhat.com Fri May 15 09:38:37 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 16:38:37 +0000 Subject: changeset in /hg/icedtea6: 2009-05-15 Lillian Angel changeset b6a3b7e35a18 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b6a3b7e35a18 description: 2009-05-15 Lillian Angel * configure.ac: Bumped version to 1.6pre. diffstat: 2 files changed, 5 insertions(+), 1 deletion(-) ChangeLog | 4 ++++ configure.ac | 2 +- diffs (20 lines): diff -r 4679c32a34c9 -r b6a3b7e35a18 ChangeLog --- a/ChangeLog Fri May 15 12:38:50 2009 -0400 +++ b/ChangeLog Fri May 15 12:39:33 2009 -0400 @@ -1,3 +1,7 @@ 2009-05-15 Lillian Angel + + * configure.ac: Bumped version to 1.6pre. + 2009-05-15 Lillian Angel * configure.ac: Bumped version. diff -r 4679c32a34c9 -r b6a3b7e35a18 configure.ac --- a/configure.ac Fri May 15 12:38:50 2009 -0400 +++ b/configure.ac Fri May 15 12:39:33 2009 -0400 @@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.5], [distro-pkg-d -AC_INIT([icedtea6], [1.5], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6], [1.6pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From langel at redhat.com Fri May 15 09:40:26 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 16:40:26 +0000 Subject: changeset in /hg/icedtea6: Fixed typo Message-ID: changeset 5b4a1b605083 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5b4a1b605083 description: Fixed typo diffstat: 2 files changed, 1 insertion(+), 3 deletions(-) Makefile.am | 2 -- NEWS | 2 +- diffs (28 lines): diff -r b6a3b7e35a18 -r 5b4a1b605083 Makefile.am --- a/Makefile.am Fri May 15 12:39:33 2009 -0400 +++ b/Makefile.am Fri May 15 12:41:25 2009 -0400 @@ -494,7 +494,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-webstart.patch \ patches/icedtea-webstart-umask.patch \ patches/icedtea-rmi_amd64.patch \ - patches/icedtea-tools.patch \ patches/icedtea-demos.patch \ patches/icedtea-timezone.patch \ patches/icedtea-use-system-tzdata.patch \ @@ -508,7 +507,6 @@ ICEDTEA_PATCHES = \ patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ patches/icedtea-sunsrc.patch \ patches/icedtea-libraries.patch \ - patches/icedtea-javafiles.patch \ patches/icedtea-core-build.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-lcms.patch \ diff -r b6a3b7e35a18 -r 5b4a1b605083 NEWS --- a/NEWS Fri May 15 12:39:33 2009 -0400 +++ b/NEWS Fri May 15 12:41:25 2009 -0400 @@ -1,4 +1,4 @@ ew in release 1.5 (2009-05-15) -ew in release 1.5 (2009-05-15) +New in release 1.5 (2009-05-15) - Static trace support through systemtap. When given the configure option --enable-systemtap IcedTea will build From langel at redhat.com Fri May 15 09:41:56 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 16:41:56 +0000 Subject: changeset in /hg/icedtea6: Reverted change committed by mistake. Message-ID: changeset 1278042da95f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1278042da95f description: Reverted change committed by mistake. diffstat: 1 file changed, 2 insertions(+) Makefile.am | 2 ++ diffs (19 lines): diff -r 5b4a1b605083 -r 1278042da95f Makefile.am --- a/Makefile.am Fri May 15 12:41:25 2009 -0400 +++ b/Makefile.am Fri May 15 12:42:54 2009 -0400 @@ -494,6 +494,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-webstart.patch \ patches/icedtea-webstart-umask.patch \ patches/icedtea-rmi_amd64.patch \ + patches/icedtea-tools.patch \ patches/icedtea-demos.patch \ patches/icedtea-timezone.patch \ patches/icedtea-use-system-tzdata.patch \ @@ -507,6 +508,7 @@ ICEDTEA_PATCHES = \ patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ patches/icedtea-sunsrc.patch \ patches/icedtea-libraries.patch \ + patches/icedtea-javafiles.patch \ patches/icedtea-core-build.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-lcms.patch \ From langel at redhat.com Fri May 15 10:44:26 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 17:44:26 +0000 Subject: changeset in /hg/icedtea6: 2009-05-15 Lillian Angel changeset 5c5cc538bd10 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5c5cc538bd10 description: 2009-05-15 Lillian Angel * Makefile.am (ICEDTEA_PATCHES): patches/icedtea-tools.patch and patches/icedtea-javafiles.patch removed from list. * patches/icedtea-tools.patch, patches/icedtea-javafiles.patch: Removed. * HACKING: Updated. diffstat: 5 files changed, 11 insertions(+), 244 deletions(-) ChangeLog | 9 ++ HACKING | 4 Makefile.am | 2 patches/icedtea-javafiles.patch | 157 --------------------------------------- patches/icedtea-tools.patch | 83 -------------------- diffs (308 lines): diff -r 1278042da95f -r 5c5cc538bd10 ChangeLog --- a/ChangeLog Fri May 15 12:42:54 2009 -0400 +++ b/ChangeLog Fri May 15 13:45:24 2009 -0400 @@ -1,3 +1,12 @@ 2009-05-15 Lillian Angel + + * Makefile.am + (ICEDTEA_PATCHES): patches/icedtea-tools.patch and + patches/icedtea-javafiles.patch removed from list. + * patches/icedtea-tools.patch, + patches/icedtea-javafiles.patch: Removed. + * HACKING: Updated. + 2009-05-15 Lillian Angel * configure.ac: Bumped version to 1.6pre. diff -r 1278042da95f -r 5c5cc538bd10 HACKING --- a/HACKING Fri May 15 12:42:54 2009 -0400 +++ b/HACKING Fri May 15 13:45:24 2009 -0400 @@ -30,7 +30,6 @@ The following patches are currently appl * icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649) * icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64. * icedtea-javac-debuginfo.patch: Ensure debugging information is generated for all class files. -* icedtea-javafiles.patch: Add missing Java files to list. * icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support. * icedtea-lcms: Applies security patch. * icedtea-lcms-2.patch: Temporary fix for https://bugs.openjdk.java.net/show_bug.cgi?id=100050. @@ -51,7 +50,6 @@ The following patches are currently appl * icedtea-sunsrc.patch: Remove service property files from TOOLS list. * icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms. * icedtea-timerqueue.patch: Fix setting of running variable (PR87). -* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti. * icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486). * icedtea-version.patch: Replace name and bug URL with IcedTea versions. * icedtea-webservices.patch: Add applet support. @@ -163,3 +161,5 @@ changes to the OpenJDK code base and/or * icedtea-core-zero-build.patch: Not required with HS14. * icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14. * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. Not required with HS14. +* icedtea-javafiles.patch: Add missing Java files to list. +* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti. diff -r 1278042da95f -r 5c5cc538bd10 Makefile.am --- a/Makefile.am Fri May 15 12:42:54 2009 -0400 +++ b/Makefile.am Fri May 15 13:45:24 2009 -0400 @@ -494,7 +494,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-webstart.patch \ patches/icedtea-webstart-umask.patch \ patches/icedtea-rmi_amd64.patch \ - patches/icedtea-tools.patch \ patches/icedtea-demos.patch \ patches/icedtea-timezone.patch \ patches/icedtea-use-system-tzdata.patch \ @@ -508,7 +507,6 @@ ICEDTEA_PATCHES = \ patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ patches/icedtea-sunsrc.patch \ patches/icedtea-libraries.patch \ - patches/icedtea-javafiles.patch \ patches/icedtea-core-build.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-lcms.patch \ diff -r 1278042da95f -r 5c5cc538bd10 patches/icedtea-javafiles.patch --- a/patches/icedtea-javafiles.patch Fri May 15 12:42:54 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ ---- openjdk/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200 -+++ openjdk/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200 -@@ -29,6 +29,80 @@ - # will generate header files - # - JAVA_JAVA_java = \ -+ java/lang/reflect/AccessibleObject.java \ -+ java/lang/reflect/AnnotatedElement.java \ -+ java/lang/reflect/Array.java \ -+ java/lang/reflect/Constructor.java \ -+ java/lang/reflect/Field.java \ -+ java/lang/reflect/GenericArrayType.java \ -+ java/lang/reflect/GenericDeclaration.java \ -+ java/lang/reflect/GenericSignatureFormatError.java \ -+ java/lang/reflect/InvocationHandler.java \ -+ java/lang/reflect/InvocationTargetException.java \ -+ java/lang/reflect/MalformedParameterizedTypeException.java \ -+ java/lang/reflect/Member.java \ -+ java/lang/reflect/Method.java \ -+ java/lang/reflect/Modifier.java \ -+ java/lang/reflect/package-info.java \ -+ java/lang/reflect/ParameterizedType.java \ -+ java/lang/reflect/Proxy.java \ -+ java/lang/reflect/ReflectAccess.java \ -+ java/lang/reflect/ReflectPermission.java \ -+ java/lang/reflect/Type.java \ -+ java/lang/reflect/TypeVariable.java \ -+ java/lang/reflect/UndeclaredThrowableException.java \ -+ java/lang/reflect/WildcardType.java \ -+ java/lang/ref/Finalizer.java \ -+ java/lang/ref/FinalReference.java \ -+ java/lang/ref/PhantomReference.java \ -+ java/lang/ref/Reference.java \ -+ java/lang/ref/ReferenceQueue.java \ -+ java/lang/ref/SoftReference.java \ -+ java/lang/ref/WeakReference.java \ -+ java/lang/management/ClassLoadingMXBean.java \ -+ java/lang/management/CompilationMXBean.java \ -+ java/lang/management/GarbageCollectorMXBean.java \ -+ java/lang/management/LockInfo.java \ -+ java/lang/management/ManagementFactory.java \ -+ java/lang/management/ManagementPermission.java \ -+ java/lang/management/MemoryManagerMXBean.java \ -+ java/lang/management/MemoryMXBean.java \ -+ java/lang/management/MemoryNotificationInfo.java \ -+ java/lang/management/MemoryPoolMXBean.java \ -+ java/lang/management/MemoryType.java \ -+ java/lang/management/MemoryUsage.java \ -+ java/lang/management/MonitorInfo.java \ -+ java/lang/management/OperatingSystemMXBean.java \ -+ java/lang/management/RuntimeMXBean.java \ -+ java/lang/management/ThreadInfo.java \ -+ java/lang/management/ThreadMXBean.java \ -+ java/lang/instrument/ClassDefinition.java \ -+ java/lang/instrument/ClassFileTransformer.java \ -+ java/lang/instrument/IllegalClassFormatException.java \ -+ java/lang/instrument/Instrumentation.java \ -+ java/lang/instrument/UnmodifiableClassException.java \ -+ java/lang/annotation/AnnotationFormatError.java \ -+ java/lang/annotation/Annotation.java \ -+ java/lang/annotation/AnnotationTypeMismatchException.java \ -+ java/lang/annotation/Documented.java \ -+ java/lang/annotation/ElementType.java \ -+ java/lang/annotation/IncompleteAnnotationException.java \ -+ java/lang/annotation/Inherited.java \ -+ java/lang/annotation/package-info.java \ -+ java/lang/annotation/Retention.java \ -+ java/lang/annotation/RetentionPolicy.java \ -+ java/lang/annotation/Target.java \ -+ java/io/IOError.java \ -+ java/lang/Deprecated.java \ -+ java/lang/Iterable.java \ -+ java/util/RandomAccess.java \ -+ java/lang/CharacterData00.java \ -+ java/lang/CharacterData01.java \ -+ java/lang/CharacterData02.java \ -+ java/lang/CharacterData0E.java \ -+ java/lang/CharacterDataLatin1.java \ -+ java/lang/CharacterDataPrivateUse.java \ -+ java/lang/CharacterDataUndefined.java \ - java/lang/Object.java \ - java/lang/Class.java \ - java/lang/Thread.java \ -@@ -135,13 +209,6 @@ - java/lang/Readable.java \ - java/lang/Override.java \ - java/lang/SuppressWarnings.java \ -- java/lang/ref/Reference.java \ -- java/lang/ref/SoftReference.java \ -- java/lang/ref/WeakReference.java \ -- java/lang/ref/FinalReference.java \ -- java/lang/ref/PhantomReference.java \ -- java/lang/ref/ReferenceQueue.java \ -- java/lang/ref/Finalizer.java \ - java/util/BitSet.java \ - java/util/Calendar.java \ - java/util/GregorianCalendar.java \ ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -62,7 +62,6 @@ - com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \ - com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \ - com/sun/corba/se/impl/encoding/TypeCodeReader.java \ -- com/sun/corba/se/impl/encoding/WrapperInputStream.java -- -- -- -+ com/sun/corba/se/impl/encoding/WrapperInputStream.java \ -+ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ -+ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -29,5 +29,6 @@ - com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ - com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ - com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ -+ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ - com/sun/corba/se/spi/presentation/rmi/StubAdapter.java - ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -81,5 +81,5 @@ - com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \ - com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \ - com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \ -- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java -- -+ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \ -+ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -30,6 +30,7 @@ - com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \ - com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \ - com/sun/corba/se/spi/monitoring/MonitoringFactories.java \ -+ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ - com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \ - com/sun/corba/se/spi/monitoring/MonitoredObject.java \ - com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -66,4 +66,5 @@ - com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ - com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ - com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ -- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java -+ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \ -+ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -81,4 +81,5 @@ - com/sun/corba/se/impl/orbutil/graph/Node.java \ - com/sun/corba/se/impl/orbutil/graph/NodeData.java \ - com/sun/corba/se/impl/orbutil/graph/Graph.java \ -- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java -+ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \ -+ com/sun/corba/se/impl/orbutil/GetPropertyAction.java diff -r 1278042da95f -r 5c5cc538bd10 patches/icedtea-tools.patch --- a/patches/icedtea-tools.patch Fri May 15 12:42:54 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.linux openjdk/jdk/make/tools/sharing/classlist.linux ---- openjdk-ecj/jdk/make/tools/sharing/classlist.linux 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.linux 2007-09-04 13:33:52.000000000 -0400 -@@ -330,7 +330,6 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction - java/awt/GraphicsEnvironment -@@ -341,7 +340,6 @@ - java/lang/ProcessEnvironment$Value - java/lang/ProcessEnvironment$StringEnvironment - java/util/Collections$UnmodifiableMap --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.solaris openjdk/jdk/make/tools/sharing/classlist.solaris ---- openjdk-ecj/jdk/make/tools/sharing/classlist.solaris 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.solaris 2007-09-04 13:34:17.000000000 -0400 -@@ -332,7 +332,6 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction - java/awt/GraphicsEnvironment -@@ -343,7 +342,6 @@ - java/lang/ProcessEnvironment$Value - java/lang/ProcessEnvironment$StringEnvironment - java/util/Collections$UnmodifiableMap --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.windows openjdk/jdk/make/tools/sharing/classlist.windows ---- openjdk-ecj/jdk/make/tools/sharing/classlist.windows 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.windows 2007-09-04 13:34:05.000000000 -0400 -@@ -333,10 +333,8 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl ---- openjdk.orig/jdk/make/java/awt/Makefile 2008-02-28 04:39:42.000000000 -0500 -+++ openjdk/jdk/make/java/awt/Makefile 2008-02-29 14:58:50.000000000 -0500 -@@ -34,7 +34,7 @@ - # - AUTO_FILES_JAVA_DIRS = java/awt sun/awt/geom - --build: properties cursors -+build: sources properties cursors - - # - # Resources -@@ -47,9 +47,11 @@ - # - include $(BUILDDIR)/common/Classes.gmk - -+sources: - - clean:: properties.clean sun.geom.clean cursors.clean - -+ - _LIBPROPS = \ - flavormap.properties - -@@ -102,6 +104,6 @@ - cursors.clean : - $(RM) -r $(CURSORDIR) - --.PHONY: properties properties.clean \ -+.PHONY: sources properties properties.clean \ - cursors sun.geom.clean cursors.clean - From langel at redhat.com Fri May 15 11:04:53 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 18:04:53 +0000 Subject: changeset in /hg/icedtea6: 2009-05-15 Lillian Angel changeset 002142bdaa0d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=002142bdaa0d description: 2009-05-15 Lillian Angel * configure.ac: Changed version back to 1.5. * .hgtags: Reverted 1.5 tag. Waiting for outstanding commits before * 1.5 release. diffstat: 3 files changed, 6 insertions(+), 2 deletions(-) .hgtags | 1 - ChangeLog | 5 +++++ configure.ac | 2 +- diffs (29 lines): diff -r 5c5cc538bd10 -r 002142bdaa0d .hgtags --- a/.hgtags Fri May 15 13:45:24 2009 -0400 +++ b/.hgtags Fri May 15 14:05:51 2009 -0400 @@ -12,4 +12,3 @@ be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 -139d7ce58c09d84003ffa75f5a99d2b1b469821a icedtea6-1.5 diff -r 5c5cc538bd10 -r 002142bdaa0d ChangeLog --- a/ChangeLog Fri May 15 13:45:24 2009 -0400 +++ b/ChangeLog Fri May 15 14:05:51 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-15 Lillian Angel + + * configure.ac: Changed version back to 1.5. + * .hgtags: Reverted 1.5 tag. Waiting for outstanding commits before 1.5 release. + 2009-05-15 Lillian Angel * Makefile.am diff -r 5c5cc538bd10 -r 002142bdaa0d configure.ac --- a/configure.ac Fri May 15 13:45:24 2009 -0400 +++ b/configure.ac Fri May 15 14:05:51 2009 -0400 @@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.6pre], [distro-pk -AC_INIT([icedtea6], [1.6pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6], [1.5], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From doko at ubuntu.com Fri May 15 11:16:51 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Fri, 15 May 2009 18:16:51 +0000 Subject: changeset in /hg/icedtea6: 2009-05-15 Matthias Klose changeset b7e4278456bc in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b7e4278456bc description: 2009-05-15 Matthias Klose * patches/icedtea-cacao-no-mmap-first-page.patch: New. * Makefile.am (ICEDTEA_PATCHES): Apply above patch. * HACKING: Update. diffstat: 4 files changed, 32 insertions(+), 1 deletion(-) ChangeLog | 6 ++++++ HACKING | 1 + Makefile.am | 3 ++- patches/icedtea-cacao-no-mmap-first-page.patch | 23 +++++++++++++++++++++++ diffs (64 lines): diff -r 002142bdaa0d -r b7e4278456bc ChangeLog --- a/ChangeLog Fri May 15 14:05:51 2009 -0400 +++ b/ChangeLog Fri May 15 20:12:25 2009 +0200 @@ -1,3 +1,9 @@ 2009-05-15 Lillian Angel + + * patches/icedtea-cacao-no-mmap-first-page.patch: New. + * Makefile.am (ICEDTEA_PATCHES): Apply above patch. + * HACKING: Update. + 2009-05-15 Lillian Angel * configure.ac: Changed version back to 1.5. diff -r 002142bdaa0d -r b7e4278456bc HACKING --- a/HACKING Fri May 15 14:05:51 2009 -0400 +++ b/HACKING Fri May 15 20:12:25 2009 +0200 @@ -95,6 +95,7 @@ The following patches are currently appl * icedtea-java2d-stroker-internal-joint.patch: Fix penultimate joint created by GeneralPath.closePath(). * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath(). * icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM. +* icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page. * icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. * icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. * icedtea-signature-iterator.patch: Add zero-specific signature handling. diff -r 002142bdaa0d -r b7e4278456bc Makefile.am --- a/Makefile.am Fri May 15 14:05:51 2009 -0400 +++ b/Makefile.am Fri May 15 20:12:25 2009 +0200 @@ -587,7 +587,8 @@ endif if BUILD_CACAO ICEDTEA_PATCHES += \ - patches/icedtea-cacao.patch + patches/icedtea-cacao.patch \ + patches/icedtea-cacao-no-mmap-first-page.patch endif if WITH_CACAO ICEDTEA_PATCHES += \ diff -r 002142bdaa0d -r b7e4278456bc patches/icedtea-cacao-no-mmap-first-page.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cacao-no-mmap-first-page.patch Fri May 15 20:12:25 2009 +0200 @@ -0,0 +1,23 @@ +--- cacao/cacao/src/vm/jit/trap.c.orig 2008-07-07 13:36:19.000000000 +0200 ++++ cacao/cacao/src/vm/jit/trap.c 2008-07-23 10:45:30.480113152 +0200 +@@ -59,20 +59,6 @@ + */ + void trap_init(void) + { +-#if !(defined(__ARM__) && defined(__LINUX__)) +- /* On arm-linux the first memory page can't be mmap'ed, as it +- contains the exception vectors. */ +- +- int pagesize; +- +- /* mmap a memory page at address 0x0, so our hardware-exceptions +- work. */ +- +- pagesize = system_getpagesize(); +- +- (void) system_mmap_anonymous(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED); +-#endif +- + TRACESUBSYSTEMINITIALIZATION("trap_init"); + + #if !defined(TRAP_INSTRUCTION_IS_LOAD) From doko at ubuntu.com Fri May 15 11:22:29 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Fri, 15 May 2009 18:22:29 +0000 Subject: changeset in /hg/icedtea6: - mention cacao Message-ID: changeset a7b9087df36e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a7b9087df36e description: - mention cacao diffstat: 1 file changed, 1 insertion(+) NEWS | 1 + diffs (11 lines): diff -r b7e4278456bc -r a7b9087df36e NEWS --- a/NEWS Fri May 15 20:12:25 2009 +0200 +++ b/NEWS Fri May 15 20:18:04 2009 +0200 @@ -14,6 +14,7 @@ New in release 1.5 (2009-05-15) HotSpot Express repository. - Updated to OpenJDK b16 build. - Visual VM updated to 1.1.1. +- Updated to support CACAO 0.99.4. - Several web browser plugin and javaws support fixes: - Fixed security handling to prevent access denials when there is a site specific exception in the policy file From gnu_andrew at member.fsf.org Fri May 15 11:29:08 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 15 May 2009 19:29:08 +0100 Subject: HotSpot 14 In-Reply-To: <4A0DB273.9060908@sun.com> References: <17c6771e0905151101g7413db57lcbcba7640af658c@mail.gmail.com> <4A0DB273.9060908@sun.com> Message-ID: <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> 2009/5/15 Erik Trimble : > Andrew John Hughes wrote: >> >> Hi all (especially Joe), >> >> Now that the HotSpot Express repositories are available, what is the >> plan for including hs14 in OpenJDK6? >> >> I did a pull of the base changeset from HS express (0) into OpenJDK6's >> hotspot repo. yesterday as a test, and it seems to apply fairly well. >> The conflicts all seem to be whitespace changes (though there's a lot >> of them -- ~210 files are affected). >> >> Do we still plan to maintain a version of HotSpot in OpenJDK6 or will >> HS Express just be used directly? >> >> Thanks, >> > > Frankly, I think this is up to the Community. > > I'm still not 100% sure of the complete list of who has write access to the > OpenJDK6 stuff, but I /think/ the proper way to do this is not move any HSX > release into the main OpenJDK6 forest until there is ?consensus that It's > Time. > The list is here: http://db.openjdk.java.net/people for your delectation and delight. > Now, that said, maybe It's Time Right Now. > IcedTea (i.e. the version of OpenJDK6 people are actually using on their distros today) has already been shipping HotSpot 14 for some time. So I think not only is the time right for OpenJDK6 upstream to also upgrade, but that it's perhaps long overdue. > > Given that the HSX repos are going to be almost exclusively Sun-only > writable (in practice, not necessarily by design), I think that the VM in > OpenJDK6 should be pulled from an HSX repo, and then have various > community-desired patches applied there, rather than try to work directly on > an HSX repo. ?That is, I expect the various HSX repos to be a reflection of > what Sun is doing, and the VM in OpenJDK6 should be a reflection of what the > Community chooses to do with the HSX work from Sun. > My preference would be for patches to go into HotSpot Express and then OpenJDK6 just pull a stable version regularly. I've already had patches committed to HotSpot as have others working on IcedTea, so I don't see an issue there. > As such, going forward, I _hope_ there is less and less of a requirement to > maintain IceTea, and that everything there can get moved over into the > appropriate OpenJDK repo. ?Not that I have anything against IceTea, it just > would be nice to cut down on the amount of work needed to maintain all these > separate codebases. > We agree. Most of IcedTea is there by necessity, not design. See http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches for our progress on getting everything upstream where we can. > -- > Erik Trimble > Java System Support > Mailstop: ?usca22-123 > Phone: ?x17195 > Santa Clara, CA > Timezone: US/Pacific (GMT-0800) > > -- 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 Erik.Trimble at Sun.COM Fri May 15 11:42:26 2009 From: Erik.Trimble at Sun.COM (Erik Trimble) Date: Fri, 15 May 2009 11:42:26 -0700 Subject: HotSpot 14 In-Reply-To: <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> References: <17c6771e0905151101g7413db57lcbcba7640af658c@mail.gmail.com> <4A0DB273.9060908@sun.com> <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> Message-ID: <4A0DB792.4020701@sun.com> Andrew John Hughes wrote: > 2009/5/15 Erik Trimble : > >> Andrew John Hughes wrote: >> >>> Hi all (especially Joe), >>> >>> Now that the HotSpot Express repositories are available, what is the >>> plan for including hs14 in OpenJDK6? >>> >>> I did a pull of the base changeset from HS express (0) into OpenJDK6's >>> hotspot repo. yesterday as a test, and it seems to apply fairly well. >>> The conflicts all seem to be whitespace changes (though there's a lot >>> of them -- ~210 files are affected). >>> >>> Do we still plan to maintain a version of HotSpot in OpenJDK6 or will >>> HS Express just be used directly? >>> >>> Thanks, >>> >>> >> Frankly, I think this is up to the Community. >> >> I'm still not 100% sure of the complete list of who has write access to the >> OpenJDK6 stuff, but I /think/ the proper way to do this is not move any HSX >> release into the main OpenJDK6 forest until there is consensus that It's >> Time. >> >> > > The list is here: http://db.openjdk.java.net/people for your > delectation and delight. > > Thanks! >> Now, that said, maybe It's Time Right Now. >> >> > > IcedTea (i.e. the version of OpenJDK6 people are actually using on > their distros today) has already been shipping HotSpot 14 for some > time. So I think not only is the time right for OpenJDK6 upstream to > also upgrade, but that it's perhaps long overdue. > > I'll check with Joe, but I think it's on my to-do list to push HSX14 to OpenJDK sometime before JavaOne. >> Given that the HSX repos are going to be almost exclusively Sun-only >> writable (in practice, not necessarily by design), I think that the VM in >> OpenJDK6 should be pulled from an HSX repo, and then have various >> community-desired patches applied there, rather than try to work directly on >> an HSX repo. That is, I expect the various HSX repos to be a reflection of >> what Sun is doing, and the VM in OpenJDK6 should be a reflection of what the >> Community chooses to do with the HSX work from Sun. >> >> > > My preference would be for patches to go into HotSpot Express and then > OpenJDK6 just pull a stable version regularly. I've already had > patches committed to HotSpot as have others working on IcedTea, so I > don't see an issue there. > Well, this needs further discussion. There's still some conflict here as to whether or not we're going to ship the Sun JDK 6 Update release train as a superset of the OpenJDK6 + HSX repositories, or if there will be things in those open repos that we exclude from the Sun JDK6 Updates. If the first case is what is happening (i.e. Sun's JDK is a superset of OpenJDK6+HSX), then, yes, we (that is, the entire Community+Sun) should just patch the appropriate HSX repo, and periodically pull it over into the OpenJDK6 forest after stabilization. If, on the other hand, the second case is what is To Be, then only certain community-submitted patches will be integrated into HSX, which means that the actual development of Hotspot for OpenJDK6 will have to happen in the OpenJDK6 forest directly. In essence, if we chose the 2nd case, there will need to be 3 VM repositories: HSX for the stuff that's going to be the Sun JDK6 release, IceTea for the patches to the HSX repository that aren't going into Sun's JDK, and OpenJDK6, which is HSX+IceTea (stabilized). -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA Timezone: US/Pacific (GMT-0800) From langel at redhat.com Fri May 15 12:14:12 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 19:14:12 +0000 Subject: changeset in /hg/icedtea6: Added tag icedtea6-1.5 for changeset ... Message-ID: changeset 67a7332a4a43 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=67a7332a4a43 description: Added tag icedtea6-1.5 for changeset a7b9087df36e diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r a7b9087df36e -r 67a7332a4a43 .hgtags --- a/.hgtags Fri May 15 20:18:04 2009 +0200 +++ b/.hgtags Fri May 15 15:15:11 2009 -0400 @@ -12,3 +12,4 @@ be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 +a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5 From langel at redhat.com Fri May 15 12:20:39 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 15 May 2009 19:20:39 +0000 Subject: changeset in /hg/icedtea6: 2009-05-15 Lillian Angel changeset 424820ae89bf in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=424820ae89bf description: 2009-05-15 Lillian Angel * configure.ac: Bumped version to 1.6pre. diffstat: 2 files changed, 5 insertions(+), 1 deletion(-) ChangeLog | 4 ++++ configure.ac | 2 +- diffs (20 lines): diff -r 67a7332a4a43 -r 424820ae89bf ChangeLog --- a/ChangeLog Fri May 15 15:15:11 2009 -0400 +++ b/ChangeLog Fri May 15 15:21:37 2009 -0400 @@ -1,3 +1,7 @@ 2009-05-15 Matthias Klose + + * configure.ac: Bumped version to 1.6pre. + 2009-05-15 Matthias Klose * patches/icedtea-cacao-no-mmap-first-page.patch: New. diff -r 67a7332a4a43 -r 424820ae89bf configure.ac --- a/configure.ac Fri May 15 15:15:11 2009 -0400 +++ b/configure.ac Fri May 15 15:21:37 2009 -0400 @@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.5], [distro-pkg-d -AC_INIT([icedtea6], [1.5], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6], [1.6pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From dbhole at redhat.com Fri May 15 13:32:34 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 15 May 2009 20:32:34 +0000 Subject: changeset in /hg/icedtea6: Initial check-in of the new npruntime... Message-ID: changeset 408be9d00bfe in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=408be9d00bfe description: Initial check-in of the new npruntime based plugin. diffstat: 31 files changed, 8794 insertions(+), 5 deletions(-) ChangeLog | 34 IcedTeaNPPlugin.cc | 2006 ++++++++++ Makefile.am | 75 configure.ac | 23 plugin/icedteanp/netscape/javascript/JSException.java | 140 plugin/icedteanp/netscape/javascript/JSObject.java | 263 + plugin/icedteanp/netscape/javascript/JSProxy.java | 58 plugin/icedteanp/netscape/javascript/JSRunnable.java | 72 plugin/icedteanp/netscape/javascript/JSUtil.java | 59 plugin/icedteanp/sun/applet/AppletSecurityContextManager.java | 71 plugin/icedteanp/sun/applet/GetMemberPluginCallRequest.java | 76 plugin/icedteanp/sun/applet/GetWindowPluginCallRequest.java | 75 plugin/icedteanp/sun/applet/JavaConsole.java | 365 + plugin/icedteanp/sun/applet/PasswordAuthenticationDialog.java | 241 + plugin/icedteanp/sun/applet/PluginAppletSecurityContext.java | 1307 ++++++ plugin/icedteanp/sun/applet/PluginAppletViewer.java | 1872 +++++++++ plugin/icedteanp/sun/applet/PluginCallRequest.java | 85 plugin/icedteanp/sun/applet/PluginCallRequestFactory.java | 60 plugin/icedteanp/sun/applet/PluginClassLoader.java | 51 plugin/icedteanp/sun/applet/PluginDebug.java | 51 plugin/icedteanp/sun/applet/PluginException.java | 53 plugin/icedteanp/sun/applet/PluginMain.java | 315 + plugin/icedteanp/sun/applet/PluginMessageConsumer.java | 119 plugin/icedteanp/sun/applet/PluginMessageHandlerWorker.java | 121 plugin/icedteanp/sun/applet/PluginObjectStore.java | 132 plugin/icedteanp/sun/applet/PluginProxyInfoRequest.java | 85 plugin/icedteanp/sun/applet/PluginProxySelector.java | 195 plugin/icedteanp/sun/applet/PluginStreamHandler.java | 479 ++ plugin/icedteanp/sun/applet/RequestQueue.java | 77 plugin/icedteanp/sun/applet/TestEnv.java | 172 plugin/icedteanp/sun/applet/VoidPluginCallRequest.java | 67 diffs (truncated from 9038 to 500 lines): diff -r 424820ae89bf -r 408be9d00bfe ChangeLog --- a/ChangeLog Fri May 15 15:21:37 2009 -0400 +++ b/ChangeLog Fri May 15 16:35:35 2009 -0400 @@ -1,3 +1,37 @@ 2009-05-15 Lillian Angel + + * Makefile.am: Wire in new plugin build. + * configure.ac: Wire in new plugin (switch --enable-npplugin). + * IcedTeaNPPlugin.cc: New file - based on GCJ Web Plugin. + * plugin/icedteanp/netscape/javascript/JSException.java: New file, copied + from the IcedTea plugin Java backend. + * plugin/icedteanp/netscape/javascript/JSObject.java: Same. + * plugin/icedteanp/netscape/javascript/JSProxy.java: Same. + * plugin/icedteanp/netscape/javascript/JSRunnable.java: Same. + * plugin/icedteanp/netscape/javascript/JSUtil.java: Same. + * plugin/icedteanp/sun/applet/AppletSecurityContextManager.java: Same. + * plugin/icedteanp/sun/applet/GetMemberPluginCallRequest.java: Same. + * plugin/icedteanp/sun/applet/GetWindowPluginCallRequest.java: Same. + * plugin/icedteanp/sun/applet/JavaConsole.java: Same. + * plugin/icedteanp/sun/applet/PasswordAuthenticationDialog.java: Same. + * plugin/icedteanp/sun/applet/PluginAppletSecurityContext.java: Same. + * plugin/icedteanp/sun/applet/PluginAppletViewer.java: Same. + * plugin/icedteanp/sun/applet/PluginCallRequest.java: Same. + * plugin/icedteanp/sun/applet/PluginCallRequestFactory.java: Same. + * plugin/icedteanp/sun/applet/PluginClassLoader.java: Same. + * plugin/icedteanp/sun/applet/PluginDebug.java: Same. + * plugin/icedteanp/sun/applet/PluginException.java: Same. + * plugin/icedteanp/sun/applet/PluginMain.java: Same. + * plugin/icedteanp/sun/applet/PluginMessageConsumer.java: Same. + * plugin/icedteanp/sun/applet/PluginMessageHandlerWorker.java: Same. + * plugin/icedteanp/sun/applet/PluginObjectStore.java: Same. + * plugin/icedteanp/sun/applet/PluginProxyInfoRequest.java: Same. + * plugin/icedteanp/sun/applet/PluginProxySelector.java: Same. + * plugin/icedteanp/sun/applet/PluginStreamHandler.java: Same. + * plugin/icedteanp/sun/applet/RequestQueue.java: Same. + * plugin/icedteanp/sun/applet/TestEnv.java: Same. + * plugin/icedteanp/sun/applet/VoidPluginCallRequest.java: Same. + 2009-05-15 Lillian Angel * configure.ac: Bumped version to 1.6pre. diff -r 424820ae89bf -r 408be9d00bfe IcedTeaNPPlugin.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/IcedTeaNPPlugin.cc Fri May 15 16:35:35 2009 -0400 @@ -0,0 +1,2006 @@ +/* gcjwebplugin.cc -- web browser plugin to execute Java applets + Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +// System includes. +#include +#include +#include +#include +#include +#include +#include +#include + +// Netscape plugin API includes. +#include +#include + +// GLib includes. +#include +#include + +// GTK includes. +#include + +// Documentbase retrieval includes. +#include +#include +#include + +// API's into Mozilla +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +// Debugging macros. +#define PLUGIN_DEBUG(message) \ + g_print ("GCJ PLUGIN: thread %p: %s\n", g_thread_self (), message) + +#define PLUGIN_DEBUG_TWO(first, second) \ + g_print ("GCJ PLUGIN: thread %p: %s %s\n", g_thread_self (), \ + first, second) + +// Error reporting macros. +#define PLUGIN_ERROR(message) \ + g_printerr ("%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__, \ + g_thread_self (), message) + +#define PLUGIN_ERROR_TWO(first, second) \ + g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__, \ + g_thread_self (), first, second) + +#define PLUGIN_ERROR_THREE(first, second, third) \ + g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__, \ + __LINE__, g_thread_self (), first, second, third) + +// Plugin information passed to about:plugins. +#define PLUGIN_NAME "IcedTea NPR Web Browser Plugin (using IcedTea)" +#define PLUGIN_DESC "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets." +#define PLUGIN_MIME_DESC \ + "application/x-java-vm:class,jar:IcedTea;" \ + "application/x-java-applet:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.1.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.1.2:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.1.3:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.2:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.2.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.2.2:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.3:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.3.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.4:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.4.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.5:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.6:class,jar:IcedTea;" \ + "application/x-java-applet;jpi-version=1.6.0_00:class,jar:IcedTea;" \ + "application/x-java-bean:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.1.2:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.1.3:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.2:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.2.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.2.2:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.3:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.3.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.4:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.4.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.5:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.6:class,jar:IcedTea;" \ + "application/x-java-bean;jpi-version=1.6.0_00:class,jar:IcedTea;" +#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE +#define PLUGIN_MIME_TYPE "application/x-java-vm" +#define PLUGIN_FILE_EXTS "class,jar,zip" +#define PLUGIN_MIME_COUNT 1 + +#define FAILURE_MESSAGE "gcjwebplugin error: Failed to run %s." \ + " For more detail rerun \"firefox -g\" in a terminal window." + +static int plugin_debug = 1; + +#define PLUGIN_DEBUG_0ARG(str) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str); \ + } \ + } while (0) + +#define PLUGIN_DEBUG_1ARG(str, arg1) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str, arg1); \ + } \ + } while (0) + +#define PLUGIN_DEBUG_2ARG(str, arg1, arg2) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str, arg1, arg2); \ + } \ + } while (0) + +#define PLUGIN_DEBUG_3ARG(str, arg1, arg2, arg3) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str, arg1, arg2, arg3); \ + } \ + } while (0) + +#define PLUGIN_DEBUG_4ARG(str, arg1, arg2, arg3, arg4) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str, arg1, arg2, arg3, arg4); \ + } \ + } while (0) + +// Documentbase retrieval required definition. +static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID); + +// Browser function table. +static NPNetscapeFuncs browserFunctions; + +// Data directory for plugin. +static gchar* data_directory = NULL; + +// Fully-qualified appletviewer executable. +static gchar* appletviewer_executable = NULL; + +// Applet viewer input channel (needs to be static because it is used in plugin_in_pipe_callback) +static GIOChannel* in_from_appletviewer = NULL; + +// Applet viewer input pipe name. +gchar* in_pipe_name; + +// Applet viewer input watch source. +gint in_watch_source; + +// Applet viewer output pipe name. +gchar* out_pipe_name; + +// Applet viewer output watch source. +gint out_watch_source; + +// Applet viewer output channel. +GIOChannel* out_to_appletviewer; + +// Tracks jvm status +gboolean jvm_up = FALSE; + +// Keeps track of initialization. NP_Initialize should only be +// called once. +gboolean initialized = false; + +GQuark ITNP_PLUGIN_ERROR = g_quark_from_string("IcedTeaNPPlugin"); + +// GCJPluginData stores all the data associated with a single plugin +// instance. A separate plugin instance is created for each +// tag. For now, each plugin instance spawns its own applet viewer +// process but this may need to change if we find pages containing +// multiple applets that expect to be running in the same VM. +struct GCJPluginData +{ + // A unique identifier for this plugin window. + gchar* instance_string; + // Mutex to protect appletviewer_alive. + GMutex* appletviewer_mutex; + // Back-pointer to the plugin instance to which this data belongs. + // This should not be freed but instead simply set to NULL. + NPP owner; + // The address of the plugin window. This should not be freed but + // instead simply set to NULL. + gpointer window_handle; + // The last plugin window width sent to us by the browser. + guint32 window_width; + // The last plugin window height sent to us by the browser. + guint32 window_height; +}; + +// Documentbase retrieval type-punning union. +typedef union +{ + void** void_field; + nsIPluginTagInfo2** info_field; +} info_union; + +// Static instance helper functions. +// Have the browser allocate a new GCJPluginData structure. +static void plugin_data_new (GCJPluginData** data); +// Retrieve the current document's documentbase. +static gchar* plugin_get_documentbase (NPP instance); +// Notify the user that the appletviewer is not installed correctly. +static void plugin_display_failure_dialog (); +// Callback used to monitor input pipe status. +static gboolean plugin_in_pipe_callback (GIOChannel* source, + GIOCondition condition, + gpointer plugin_data); +// Callback used to monitor output pipe status. +static gboolean plugin_out_pipe_callback (GIOChannel* source, + GIOCondition condition, + gpointer plugin_data); +static NPError plugin_start_appletviewer (GCJPluginData* data); +static gchar* plugin_create_applet_tag (int16 argc, char* argn[], + char* argv[]); +static void plugin_send_message_to_appletviewer (gchar const* message); +static void plugin_stop_appletviewer (); +// Uninitialize GCJPluginData structure +static void plugin_data_destroy (NPP instance); + +NS_IMETHODIMP get_cookie_info(const char* siteAddr, char** cookieString); +void get_proxy_info(const char* siteAddr, char** proxy_scheme, char** proxy_host, char** proxy_port, GError *error); +void decode_url(const gchar* url, gchar** decoded_url); +void consume_message(gchar* message); +void start_jvm_if_needed(); +static void appletviewer_monitor(GPid pid, gint status, gpointer data); + +// Global instance counter. +// Mutex to protect plugin_instance_counter. +static GMutex* plugin_instance_mutex = NULL; +// A global variable for reporting GLib errors. This must be free'd +// and set to NULL after each use. +static GError* channel_error = NULL; + +static GHashTable* instance_to_id_map = g_hash_table_new(NULL, NULL); +static GHashTable* id_to_instance_map = g_hash_table_new(NULL, NULL); +static gint instance_counter = 1; +static GPid appletviewer_pid = -1; +static guint appletviewer_watch_id = -1; + +// Functions prefixed by GCJ_ are instance functions. They are called +// by the browser and operate on instances of GCJPluginData. +// Functions prefixed by plugin_ are static helper functions. +// Functions prefixed by NP_ are factory functions. They are called +// by the browser and provide functionality needed to create plugin +// instances. + +// INSTANCE FUNCTIONS + +// Creates a new gcjwebplugin instance. This function creates a +// GCJPluginData* and stores it in instance->pdata. The following +// GCJPluginData fiels are initialized: instance_string, in_pipe_name, +// in_from_appletviewer, in_watch_source, out_pipe_name, +// out_to_appletviewer, out_watch_source, appletviewer_mutex, owner, +// appletviewer_alive. In addition two pipe files are created. All +// of those fields must be properly destroyed, and the pipes deleted, +// by GCJ_Destroy. If an error occurs during initialization then this +// function will free anything that's been allocated so far, set +// instance->pdata to NULL and return an error code. +NPError +GCJ_New (NPMIMEType pluginType, NPP instance, uint16 mode, + int16 argc, char* argn[], char* argv[], + NPSavedData* saved) +{ + PLUGIN_DEBUG ("GCJ_New"); + + NPError np_error = NPERR_NO_ERROR; + GCJPluginData* data = NULL; + + gchar* documentbase = NULL; + gchar* read_message = NULL; + gchar* applet_tag = NULL; + gchar* tag_message = NULL; + gchar* cookie_info = NULL; + + if (!instance) + { + PLUGIN_ERROR ("Browser-provided instance pointer is NULL."); + np_error = NPERR_INVALID_INSTANCE_ERROR; + goto cleanup_done; + } + + // data + plugin_data_new (&data); + if (data == NULL) + { + PLUGIN_ERROR ("Failed to allocate plugin data."); + np_error = NPERR_OUT_OF_MEMORY_ERROR; + goto cleanup_done; + } + + // start the jvm if needed + start_jvm_if_needed(); + + // Initialize data->instance_string. + // + // instance_string should be unique for this process so we use a + // combination of getpid and plugin_instance_counter. + // + // Critical region. Reference and increment plugin_instance_counter + // global. + g_mutex_lock (plugin_instance_mutex); + + // data->instance_string + data->instance_string = g_strdup_printf ("%d", + instance_counter); + + g_mutex_unlock (plugin_instance_mutex); + + // data->appletviewer_mutex + data->appletviewer_mutex = g_mutex_new (); + + g_mutex_lock (data->appletviewer_mutex); + + // Documentbase retrieval. + documentbase = plugin_get_documentbase (instance); + if (!documentbase) + { + PLUGIN_ERROR ("Documentbase retrieval failed." + " Browser not Mozilla-based?"); + goto cleanup_appletviewer_mutex; + } + + // Send applet tag message to appletviewer. + applet_tag = plugin_create_applet_tag (argc, argn, argv); + + tag_message = (gchar*) malloc(strlen(applet_tag)*sizeof(gchar) + 1024); + g_sprintf(tag_message, "instance %d tag %s %s", instance_counter, documentbase, applet_tag); + + //plugin_send_message_to_appletviewer (data, data->instance_string); + plugin_send_message_to_appletviewer (tag_message); + + //send cookie information + char* cookie_string; + if (get_cookie_info(documentbase, &cookie_string) == NS_OK) + { + cookie_info = (gchar*) malloc(sizeof(cookie_string) + 1024); + g_sprintf(cookie_info, "instance %d cookie %s", instance_counter, cookie_string); + } + else + { + cookie_info = (gchar*) malloc(1024); + g_sprintf(cookie_info, "instance %d cookie", instance_counter); + } + + plugin_send_message_to_appletviewer (cookie_info); + + g_mutex_unlock (data->appletviewer_mutex); + + // If initialization succeeded entirely then we store the plugin + // data in the instance structure and return. Otherwise we free the + // data we've allocated so far and set instance->pdata to NULL. + + // Set back-pointer to owner instance. + data->owner = instance; + instance->pdata = data; + goto cleanup_done; + + cleanup_appletviewer_mutex: + g_free (data->appletviewer_mutex); + data->appletviewer_mutex = NULL; + + // cleanup_instance_string: + g_free (data->instance_string); + data->instance_string = NULL; + + // cleanup_data: + // Eliminate back-pointer to plugin instance. + data->owner = NULL; + (*browserFunctions.memfree) (data); + data = NULL; + + // Initialization failed so return a NULL pointer for the browser + // data. + instance->pdata = NULL; + + cleanup_done: + g_free (tag_message); + tag_message = NULL; + g_free (applet_tag); + applet_tag = NULL; + g_free (read_message); + read_message = NULL; + g_free (documentbase); + documentbase = NULL; + From dbhole at redhat.com Fri May 15 13:44:04 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 15 May 2009 16:44:04 -0400 Subject: New IcedTeaNPPlugin Message-ID: <20090515204404.GC19978@redhat.com> Hi, I have checked in the first version of the new Java browser plugin. Details are in my blog post here: http://dbhole.wordpress.com/ Cheers, Deepak From mvfranz at gmail.com Fri May 15 15:38:32 2009 From: mvfranz at gmail.com (Michael Franz) Date: Fri, 15 May 2009 18:38:32 -0400 Subject: Caciocavallo! In-Reply-To: <17c6771e0905140422m36c0a4a9ka1f6527366add542@mail.gmail.com> References: <17c6771e0905140422m36c0a4a9ka1f6527366add542@mail.gmail.com> Message-ID: Is it possible to get a copy of the slides used for this presentation? On Thu, May 14, 2009 at 7:22 AM, Andrew John Hughes < gnu_andrew at member.fsf.org> wrote: > Now available for your viewing pleasure: > > http://www.archive.org/details/fosdem_2009_free_java_caciocavallo > http://gnuandrew.blip.tv/file/2109528/ > > Thanks to Roman & Mario. > -- > 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 > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090515/edac987d/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri May 15 19:43:21 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 16 May 2009 02:43:21 +0000 Subject: [Bug 333] New: JVM crashes when try load LibGlade file Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=333 Summary: JVM crashes when try load LibGlade file Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: critical Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: saulotoledo at gmail.com CC: saulotoledo at gmail.com I'm was trying put libGlade code to work with Java and, when I loaded the file with: (...) public MainApp() throws FileNotFoundException, GladeXMLException, IOException { LibGlade arvoreDeWidgets = new LibGlade("./MainApp.glade", this); } (...) The JVM crashes and I receive this log: ------------------------------------------------------------------------------ # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007f445b7ecd79, pid=15515, tid=139931590691152 # # JRE version: 6.0-b14 # Java VM: OpenJDK 64-Bit Server VM (14.0-b10 mixed mode linux-amd64 ) # Distribution: Debian GNU/Linux unstable (sid), package 6b14-1.5~pre1-5 # Problematic frame: # V [libjvm.so+0x3d3d79] # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # --------------- T H R E A D --------------- Current thread (0x00000000021ae000): JavaThread "main" [_thread_in_vm, id=15520, stack(0x00007f445cb18000,0x00007f445cc19000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x0000000000000081 Registers: RAX=0x0000000000000001, RBX=0x00000000021ae000, RCX=0x00000000021ae1c0, RDX=0x0000000000000001 RSP=0x00007f445cc17170, RBP=0x00007f445cc17200, RSI=0x00000000021ae000, RDI=0x00007f44131b3910 R8 =0x00007f440c101120, R9 =0x524553524150206e, R10=0x204853494e49465f, R11=0x0000000000000001 R12=0x0000000002217ec0, R13=0x0000000000000011, R14=0x0000000000000001, R15=0x0000000000000010 RIP=0x00007f445b7ecd79, EFL=0x0000000000010246, CSGSFS=0x0000000000000033, ERR=0x0000000000000004 TRAPNO=0x000000000000000e Top of Stack: (sp=0x00007f445cc17170) 0x00007f445cc17170: 00007f440c1012fe 0000000000000002 0x00007f445cc17180: 0000000000000009 00007f445cc171a0 0x00007f445cc17190: 00007f440c0c6a40 00007f4410cf1adb 0x00007f445cc171a0: 00000000021ae000 00000000021aec08 0x00007f445cc171b0: 000000860000021e 00007f445bacb558 0x00007f445cc171c0: 00000000021ae000 00007f445bf0ac80 0x00007f445cc171d0: 00007f440c0feeee 00007f440c0c6a40 0x00007f445cc171e0: 0000000000000004 0000000000000010 0x00007f445cc171f0: 0000000000000005 0000000000000010 0x00007f445cc17200: 00007f445cc17240 00007f4406798dc0 0x00007f445cc17210: 00000000021ae1c0 00007f440c0c6a40 0x00007f445cc17220: 0000001000000004 00007f44116166e2 0x00007f445cc17230: 00000000021ae1c0 0000000002217ec0 0x00007f445cc17240: 0000000000000010 00007f440b6b5de1 0x00007f445cc17250: 00007f445cc172a0 00007f445cc176b0 0x00007f445cc17260: 00007f445cc17710 00007f4411617790 0x00007f445cc17270: 00007f44116166e2 0000000000000000 0x00007f445cc17280: 0000000000000000 00007f4406798d74 0x00007f445cc17290: 00000000021ae1c0 000000100c000020 0x00007f445cc172a0: 0000000000000010 00007f4410d0bf64 0x00007f445cc172b0: 00007f440c101120 00007f440c0f6ce0 0x00007f445cc172c0: 0000000000001b4d 00007f4410d0bf64 0x00007f445cc172d0: 00007f440c101120 00007f440c1012ce 0x00007f445cc172e0: 0000000000000098 00007f4410d0bf64 0x00007f445cc172f0: 00007f440c101120 0000000000000001 0x00007f445cc17300: 00007f440c0f6ce0 0000000000000001 0x00007f445cc17310: 0000000000000098 00007f440c0f6ce0 0x00007f445cc17320: 0000000000000001 00007f4410ce9a7e 0x00007f445cc17330: 00007f440c0f6ce0 00007f440c0f6ce0 0x00007f445cc17340: 00007f440c1012ce 00007f4410d0bf64 0x00007f445cc17350: 00007f440c101120 00007f440c0f6ce0 0x00007f445cc17360: 0000000000001b4d 00007f4410d0bf64 Instructions: (pc=0x00007f445b7ecd79) 0x00007f445b7ecd69: 49 8b 3c 24 e8 ce 09 ff ff 4c 8d 68 10 49 89 c6 0x00007f445b7ecd79: 4d 8b 65 70 48 c7 45 98 00 00 00 00 4d 85 e4 74 Stack: [0x00007f445cb18000,0x00007f445cc19000], sp=0x00007f445cc17170, free space=1020k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) V [libjvm.so+0x3d3d79] C [libgladejni-2.12.so+0xdc0] libglade_log_handler+0x4c Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j org.gnu.glade.LibGlade.glade_xml_new(Ljava/lang/String;Ljava/lang/String;)Lorg/gnu/glib/Handle;+0 j org.gnu.glade.LibGlade.(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)V+48 j org.gnu.glade.LibGlade.(Ljava/lang/String;Ljava/lang/Object;)V+4 j MainApp.()V+11 j MainApp.main([Ljava/lang/String;)V+7 v ~StubRoutines::call_stub --------------- P R O C E S S --------------- Java Threads: ( => current thread ) 0x00007f440c004800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=15531, stack(0x00007f4411ea5000,0x00007f4411fa6000)] 0x00007f440c001000 JavaThread "CompilerThread1" daemon [_thread_blocked, id=15530, stack(0x00007f4411fa6000,0x00007f44120a7000)] 0x0000000002248800 JavaThread "CompilerThread0" daemon [_thread_blocked, id=15529, stack(0x00007f44120a7000,0x00007f44121a8000)] 0x0000000002246800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=15528, stack(0x00007f44121a8000,0x00007f44122a9000)] 0x000000000221d000 JavaThread "Finalizer" daemon [_thread_blocked, id=15527, stack(0x00007f44123eb000,0x00007f44124ec000)] 0x000000000221a800 JavaThread "Reference Handler" daemon [_thread_blocked, id=15526, stack(0x00007f44124ec000,0x00007f44125ed000)] =>0x00000000021ae000 JavaThread "main" [_thread_in_vm, id=15520, stack(0x00007f445cb18000,0x00007f445cc19000)] Other Threads: 0x0000000002216000 VMThread [stack: 0x00007f44125ed000,0x00007f44126ee000] [id=15525] 0x00007f440c007000 WatcherThread [stack: 0x00007f4411da4000,0x00007f4411ea5000] [id=15532] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap PSYoungGen total 17152K, used 596K [0x00007f4443d00000, 0x00007f4445020000, 0x00007f4456f00000) eden space 14720K, 4% used [0x00007f4443d00000,0x00007f4443d95360,0x00007f4444b60000) from space 2432K, 0% used [0x00007f4444dc0000,0x00007f4444dc0000,0x00007f4445020000) to space 2432K, 0% used [0x00007f4444b60000,0x00007f4444b60000,0x00007f4444dc0000) PSOldGen total 39168K, used 0K [0x00007f441d900000, 0x00007f441ff40000, 0x00007f4443d00000) object space 39168K, 0% used [0x00007f441d900000,0x00007f441d900000,0x00007f441ff40000) PSPermGen total 21248K, used 3324K [0x00007f4413100000, 0x00007f44145c0000, 0x00007f441d900000) object space 21248K, 15% used [0x00007f4413100000,0x00007f441343f1c8,0x00007f44145c0000) Dynamic libraries: 00400000-00409000 r-xp 00000000 08:17 1844363 /usr/lib/jvm/java-6-openjdk/jre/bin/java 00608000-00609000 rw-p 00008000 08:17 1844363 /usr/lib/jvm/java-6-openjdk/jre/bin/java 021a5000-02252000 rw-p 021a5000 00:00 0 [heap] 7f44062a2000-7f4406381000 r-xp 00000000 08:17 1843525 /usr/lib/jni/libgtkjni-2.10.so 7f4406381000-7f4406580000 ---p 000df000 08:17 1843525 /usr/lib/jni/libgtkjni-2.10.so 7f4406580000-7f4406586000 rw-p 000de000 08:17 1843525 /usr/lib/jni/libgtkjni-2.10.so 7f4406586000-7f4406597000 r-xp 00000000 08:17 1843521 /usr/lib/jni/libglibjni-0.4.so 7f4406597000-7f4406797000 ---p 00011000 08:17 1843521 /usr/lib/jni/libglibjni-0.4.so 7f4406797000-7f4406798000 rw-p 00011000 08:17 1843521 /usr/lib/jni/libglibjni-0.4.so 7f4406798000-7f440679a000 r-xp 00000000 08:17 1843536 /usr/lib/jni/libgladejni-2.12.so 7f440679a000-7f4406999000 ---p 00002000 08:17 1843536 /usr/lib/jni/libgladejni-2.12.so 7f4406999000-7f440699a000 rw-p 00001000 08:17 1843536 /usr/lib/jni/libgladejni-2.12.so 7f440699a000-7f44069c4000 r-xp 00000000 08:17 1032721 /usr/lib/gtk-2.0/2.10.0/engines/libclearlooks.so 7f44069c4000-7f4406bc4000 ---p 0002a000 08:17 1032721 /usr/lib/gtk-2.0/2.10.0/engines/libclearlooks.so 7f4406bc4000-7f4406bc5000 rw-p 0002a000 08:17 1032721 /usr/lib/gtk-2.0/2.10.0/engines/libclearlooks.so 7f4406bc5000-7f4406bce000 r-xp 00000000 08:17 1730860 /usr/lib/libltdl.so.7.2.0 7f4406bce000-7f4406dcd000 ---p 00009000 08:17 1730860 /usr/lib/libltdl.so.7.2.0 7f4406dcd000-7f4406dce000 rw-p 00008000 08:17 1730860 /usr/lib/libltdl.so.7.2.0 7f4406dce000-7f4406ddb000 r-xp 00000000 08:17 1730372 /usr/lib/libtdb.so.1.1.3 7f4406ddb000-7f4406fda000 ---p 0000d000 08:17 1730372 /usr/lib/libtdb.so.1.1.3 7f4406fda000-7f4406fdb000 rw-p 0000c000 08:17 1730372 /usr/lib/libtdb.so.1.1.3 7f4406fdb000-7f4406fe0000 r-xp 00000000 08:17 1729795 /usr/lib/libogg.so.0.5.3 7f4406fe0000-7f44071df000 ---p 00005000 08:17 1729795 /usr/lib/libogg.so.0.5.3 7f44071df000-7f44071e0000 rw-p 00004000 08:17 1729795 /usr/lib/libogg.so.0.5.3 7f44071e0000-7f44071ff000 r-xp 00000000 08:17 1730069 /usr/lib/libvorbis.so.0.4.0 7f44071ff000-7f44073fe000 ---p 0001f000 08:17 1730069 /usr/lib/libvorbis.so.0.4.0 7f44073fe000-7f440740d000 rw-p 0001e000 08:17 1730069 /usr/lib/libvorbis.so.0.4.0 7f440740d000-7f4407414000 r-xp 00000000 08:17 1730004 /usr/lib/libvorbisfile.so.3.2.0 7f4407414000-7f4407613000 ---p 00007000 08:17 1730004 /usr/lib/libvorbisfile.so.3.2.0 7f4407613000-7f4407614000 rw-p 00006000 08:17 1730004 /usr/lib/libvorbisfile.so.3.2.0 7f4407614000-7f4407623000 r-xp 00000000 08:17 1732305 /usr/lib/libcanberra.so.0.1.4 7f4407623000-7f4407822000 ---p 0000f000 08:17 1732305 /usr/lib/libcanberra.so.0.1.4 7f4407822000-7f4407823000 rw-p 0000e000 08:17 1732305 /usr/lib/libcanberra.so.0.1.4 7f4407823000-7f4407826000 r-xp 00000000 08:17 1732220 /usr/lib/libcanberra-gtk.so.0.0.4 7f4407826000-7f4407a26000 ---p 00003000 08:17 1732220 /usr/lib/libcanberra-gtk.so.0.0.4 7f4407a26000-7f4407a27000 rw-p 00003000 08:17 1732220 /usr/lib/libcanberra-gtk.so.0.0.4 7f4407a27000-7f4407a2c000 r-xp 00000000 08:17 1745299 /usr/lib/gtk-2.0/modules/libcanberra-gtk-module.so 7f4407a2c000-7f4407c2b000 ---p 00005000 08:17 1745299 /usr/lib/gtk-2.0/modules/libcanberra-gtk-module.so 7f4407c2b000-7f4407c2c000 rw-p 00004000 08:17 1745299 /usr/lib/gtk-2.0/modules/libcanberra-gtk-module.so 7f4407c2c000-7f4407c31000 r-xp 00000000 08:17 1730018 /usr/lib/libXdmcp.so.6.0.0 7f4407c31000-7f4407e30000 ---p 00005000 08:17 1730018 /usr/lib/libXdmcp.so.6.0.0 7f4407e30000-7f4407e31000 rw-p 00004000 08:17 1730018 /usr/lib/libXdmcp.so.6.0.0 7f4407e31000-7f4407e33000 r-xp 00000000 08:17 1729473 /usr/lib/libXau.so.6.0.0 7f4407e33000-7f4408032000 ---p 00002000 08:17 1729473 /usr/lib/libXau.so.6.0.0 7f4408032000-7f4408033000 rw-p 00001000 08:17 1729473 /usr/lib/libXau.so.6.0.0 7f4408033000-7f440805a000 r-xp 00000000 08:17 1729831 /usr/lib/libexpat.so.1.5.2 7f440805a000-7f440825a000 ---p 00027000 08:17 1729831 /usr/lib/libexpat.so.1.5.2 7f440825a000-7f440825c000 rw-p 00027000 08:17 1729831 /usr/lib/libexpat.so.1.5.2 7f440825c000-7f4408276000 r-xp 00000000 08:11 1540140 /lib/libselinux.so.1 7f4408276000-7f4408475000 ---p 0001a000 08:11 1540140 /lib/libselinux.so.1 7f4408475000-7f4408477000 rw-p 00019000 08:11 1540140 /lib/libselinux.so.1 7f4408477000-7f4408478000 rw-p 7f4408477000 00:00 0 7f4408478000-7f4408493000 r-xp 00000000 08:17 1729477 /usr/lib/libxcb.so.1.1.0 7f4408493000-7f4408693000 ---p 0001b000 08:17 1729477 /usr/lib/libxcb.so.1.1.0 7f4408693000-7f4408694000 rw-p 0001b000 08:17 1729477 /usr/lib/libxcb.so.1.1.0 7f4408694000-7f440869b000 r-xp 00000000 08:17 1729936 /usr/lib/libxcb-render.so.0.0.0 7f440869b000-7f440889b000 ---p 00007000 08:17 1729936 /usr/lib/libxcb-render.so.0.0.0 7f440889b000-7f440889c000 rw-p 00007000 08:17 1729936 /usr/lib/libxcb-render.so.0.0.0 7f440889c000-7f440889f000 r-xp 00000000 08:17 1730836 /usr/lib/libxcb-render-util.so.0.0.0 7f440889f000-7f4408a9e000 ---p 00003000 08:17 1730836 /usr/lib/libxcb-render-util.so.0.0.0 7f4408a9e000-7f4408a9f000 rw-p 00002000 08:17 1730836 /usr/lib/libxcb-render-util.so.0.0.0 7f4408a9f000-7f4408ac4000 r-xp 00000000 08:17 1728893 /usr/lib/libpng12.so.0.35.0 7f4408ac4000-7f4408cc3000 ---p 00025000 08:17 1728893 /usr/lib/libpng12.so.0.35.0 7f4408cc3000-7f4408cc4000 rw-p 00024000 08:17 1728893 /usr/lib/libpng12.so.0.35.0 7f4408cc4000-7f4408cdc000 r-xp 00000000 08:17 1730547 /usr/lib/libdirect-1.2.so.0.7.0 7f4408cdc000-7f4408edc000 ---p 00018000 08:17 1730547 /usr/lib/libdirect-1.2.so.0.7.0 7f4408edc000-7f4408edd000 rw-p 00018000 08:17 1730547 /usr/lib/libdirect-1.2.so.0.7.0 7f4408edd000-7f4408ede000 rw-p 7f4408edd000 00:00 0 7f4408ede000-7f4408ee7000 r-xp 00000000 08:17 1730698 /usr/lib/libfusion-1.2.so.0.7.0 7f4408ee7000-7f44090e7000 ---p 00009000 08:17 1730698 /usr/lib/libfusion-1.2.so.0.7.0 7f44090e7000-7f44090e8000 rw-p 00009000 08:17 1730698 /usr/lib/libfusion-1.2.so.0.7.0 7f44090e8000-7f440916e000 r-xp 00000000 08:17 1730546 /usr/lib/libdirectfb-1.2.so.0.7.0 7f440916e000-7f440936e000 ---p 00086000 08:17 1730546 /usr/lib/libdirectfb-1.2.so.0.7.0 7f440936e000-7f4409372000 rw-p 00086000 08:17 1730546 /usr/lib/libdirectfb-1.2.so.0.7.0 7f4409372000-7f44093b5000 r-xp 00000000 08:17 1729934 /usr/lib/libpixman-1.so.0.14.0 7f44093b5000-7f44095b4000 ---p 00043000 08:17 1729934 /usr/lib/libpixman-1.so.0.14.0 7f44095b4000-7f44095b7000 rw-p 00042000 08:17 1729934 /usr/lib/libpixman-1.so.0.14.0 7f44095b7000-7f44095c0000 r-xp 00000000 08:17 1730045 /usr/lib/libXcursor.so.1.0.2 7f44095c0000-7f44097c0000 ---p 00009000 08:17 1730045 /usr/lib/libXcursor.so.1.0.2 7f44097c0000-7f44097c1000 rw-p 00009000 08:17 1730045 /usr/lib/libXcursor.so.1.0.2 7f44097c1000-7f44097c9000 r-xp 00000000 08:17 1729569 /usr/lib/libXrandr.so.2.2.0 7f44097c9000-7f44099c8000 ---p 00008000 08:17 1729569 /usr/lib/libXrandr.so.2.2.0 7f44099c8000-7f44099c9000 rw-p 00007000 08:17 1729569 /usr/lib/libXrandr.so.2.2.0 7f44099c9000-7f44099d2000 r-xp 00000000 08:17 1729561 /usr/lib/libXi.so.6.0.0 7f44099d2000-7f4409bd2000 ---p 00009000 08:17 1729561 /usr/lib/libXi.so.6.0.0 7f4409bd2000-7f4409bd3000 rw-p 00009000 08:17 1729561 /usr/lib/libXi.so.6.0.0 7f4409bd3000-7f4409bd5000 r-xp 00000000 08:17 1730072 /usr/lib/libXinerama.so.1.0.0 7f4409bd5000-7f4409dd4000 ---p 00002000 08:17 1730072 /usr/lib/libXinerama.so.1.0.0 7f4409dd4000-7f4409dd5000 rw-p 00001000 08:17 1730072 /usr/lib/libXinerama.so.1.0.0 7f4409dd5000-7f4409dde000 r-xp 00000000 08:17 1730043 /usr/lib/libXrender.so.1.3.0 7f4409dde000-7f4409fdd000 ---p 00009000 08:17 1730043 /usr/lib/libXrender.so.1.3.0 7f4409fdd000-7f4409fde000 rw-p 00008000 08:17 1730043 /usr/lib/libXrender.so.1.3.0 7f4409fde000-7f4409fee000 r-xp 00000000 08:17 1730034 /usr/lib/libXext.so.6.4.0 7f4409fee000-7f440a1ee000 ---p 00010000 08:17 1730034 /usr/lib/libXext.so.6.4.0 7f440a1ee000-7f440a1ef000 rw-p 00010000 08:17 1730034 /usr/lib/libXext.so.6.4.0 7f440a1ef000-7f440a1f1000 r-xp 00000000 08:17 1730064 /usr/lib/libXdamage.so.1.1.0 7f440a1f1000-7f440a3f0000 ---p 00002000 08:17 1730064 /usr/lib/libXdamage.so.1.1.0 7f440a3f0000-7f440a3f1000 rw-p 00001000 08:17 1730064 /usr/lib/libXdamage.so.1.1.0 7f440a3f1000-7f440a3f3000 r-xp 00000000 08:17 1730172 /usr/lib/libXcomposite.so.1.0.0 7f440a3f3000-7f440a5f2000 ---p 00002000 08:17 1730172 /usr/lib/libXcomposite.so.1.0.0 7f440a5f2000-7f440a5f3000 rw-p 00001000 08:17 1730172 /usr/lib/libXcomposite.so.1.0.0 7f440a5f3000-7f440a728000 r-xp 00000000 08:17 1729479 /usr/lib/libX11.so.6.2.0 7f440a728000-7f440a928000 ---p 00135000 08:17 1729479 /usr/lib/libX11.so.6.2.0 7f440a928000-7f440a92e000 rw-p 00135000 08:17 1729479 /usr/lib/libX11.so.6.2.0 7f440a92e000-7f440a956000 rw-p 7f440a92e000 00:00 0 7f440aae1000-7f440ab11000 r-xp 00000000 08:17 1729836 /usr/lib/libfontconfig.so.1.3.0 7f440ab11000-7f440ad10000 ---p 00030000 08:17 1729836 /usr/lib/libfontconfig.so.1.3.0 7f440ad10000-7f440ad12000 rw-p 0002f000 08:17 1729836 /usr/lib/libfontconfig.so.1.3.0 7f440ad12000-7f440ad94000 r-xp 00000000 08:17 1729574 /usr/lib/libfreetype.so.6.3.20 7f440ad94000-7f440af93000 ---p 00082000 08:17 1729574 /usr/lib/libfreetype.so.6.3.20 7f440af93000-7f440af99000 rw-p 00081000 08:17 1729574 /usr/lib/libfreetype.so.6.3.20 7f440af99000-7f440b012000 r-xp 00000000 08:17 1730099 /usr/lib/libgio-2.0.so.0.2000.1 7f440b012000-7f440b212000 ---p 00079000 08:17 1730099 /usr/lib/libgio-2.0.so.0.2000.1 7f440b212000-7f440b214000 rw-p 00079000 08:17 1730099 /usr/lib/libgio-2.0.so.0.2000.1 7f440b214000-7f440b215000 rw-p 7f440b214000 00:00 0 7f440b215000-7f440b242000 r-xp 00000000 08:17 1729775 /usr/lib/libpangoft2-1.0.so.0.2400.0 7f440b242000-7f440b442000 ---p 0002d000 08:17 1729775 /usr/lib/libpangoft2-1.0.so.0.2400.0 7f440b442000-7f440b443000 rw-p 0002d000 08:17 1729775 /usr/lib/libpangoft2-1.0.so.0.2400.0 7f440b443000-7f440b472000 r-xp 00000000 08:17 1730601 /usr/lib/libpcre.so.3.12.1 7f440b472000-7f440b671000 ---p 0002f000 08:17 1730601 /usr/lib/libpcre.so.3.12.1 7f440b671000-7f440b672000 rw-p 0002e000 08:17 1730601 /usr/lib/libpcre.so.3.12.1 7f440b672000-7f440b735000 r-xp 00000000 08:17 1729791 /usr/lib/libglib-2.0.so.0.2000.1 7f440b735000-7f440b934000 ---p 000c3000 08:17 1729791 /usr/lib/libglib-2.0.so.0.2000.1 7f440b934000-7f440b936000 rw-p 000c2000 08:17 1729791 /usr/lib/libglib-2.0.so.0.2000.1 7f440b936000-7f440b939000 r-xp 00000000 08:17 1729919 /usr/lib/libgmodule-2.0.so.0.2000.1 7f440b939000-7f440bb38000 ---p 00003000 08:17 1729919 /usr/lib/libgmodule-2.0.so.0.2000.1 7f440bb38000-7f440bb39000 rw-p 00002000 08:17 1729919 /usr/lib/libgmodule-2.0.so.0.2000.1 7f440bb39000-7f440bb7c000 r-xp 00000000 08:17 1729945 /usr/lib/libgobject-2.0.so.0.2000.1 7f440bb7c000-7f440bd7c000 ---p 00043000 08:17 1729945 /usr/lib/libgobject-2.0.so.0.2000.1 7f440bd7c000-7f440bd7e000 rw-p 00043000 08:17 1729945 /usr/lib/libgobject-2.0.so.0.2000.1 7f440bd7e000-7f440bdfd000 r-xp 00000000 08:17 1729006 /usr/lib/libcairo.so.2.10800.6 7f440bdfd000-7f440bffd000 ---p 0007f000 08:17 1729006 /usr/lib/libcairo.so.2.10800.6 7f440bffd000-7f440c000000 rw-p 0007f000 08:17 1729006 /usr/lib/libcairo.so.2.10800.6 7f440c000000-7f440c105000 rw-p 7f440c000000 00:00 0 7f440c105000-7f4410000000 ---p 7f440c105000 00:00 0 7f4410022000-7f4410049000 r--p 00000000 08:17 619942 /usr/share/locale/pt/LC_MESSAGES/gtk20-properties.mo 7f4410049000-7f4410070000 r--p 00000000 08:17 1204303 /usr/share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo 7f4410070000-7f4410075000 r-xp 00000000 08:17 1730026 /usr/lib/libXfixes.so.3.1.0 7f4410075000-7f4410174000 ---p 00005000 08:17 1730026 /usr/lib/libXfixes.so.3.1.0 7f4410174000-7f4410175000 rw-p 00004000 08:17 1730026 /usr/lib/libXfixes.so.3.1.0 7f4410175000-7f44101bd000 r-xp 00000000 08:17 1729976 /usr/lib/libpango-1.0.so.0.2400.0 7f44101bd000-7f44103bd000 ---p 00048000 08:17 1729976 /usr/lib/libpango-1.0.so.0.2400.0 7f44103bd000-7f44103c0000 rw-p 00048000 08:17 1729976 /usr/lib/libpango-1.0.so.0.2400.0 7f44103c0000-7f44103cb000 r-xp 00000000 08:17 1729029 /usr/lib/libpangocairo-1.0.so.0.2400.0 7f44103cb000-7f44105cb000 ---p 0000b000 08:17 1729029 /usr/lib/libpangocairo-1.0.so.0.2400.0 7f44105cb000-7f44105cc000 rw-p 0000b000 08:17 1729029 /usr/lib/libpangocairo-1.0.so.0.2400.0 7f44105cc000-7f44105e6000 r-xp 00000000 08:17 1729024 /usr/lib/libgdk_pixbuf-2.0.so.0.1600.1 7f44105e6000-7f44107e6000 ---p 0001a000 08:17 1729024 /usr/lib/libgdk_pixbuf-2.0.so.0.1600.1 7f44107e6000-7f44107e7000 rw-p 0001a000 08:17 1729024 /usr/lib/libgdk_pixbuf-2.0.so.0.1600.1 7f44107e7000-7f4410805000 r-xp 00000000 08:17 1728898 /usr/lib/libatk-1.0.so.0.2609.1 7f4410805000-7f4410a05000 ---p 0001e000 08:17 1728898 /usr/lib/libatk-1.0.so.0.2609.1 7f4410a05000-7f4410a08000 rw-p 0001e000 08:17 1728898 /usr/lib/libatk-1.0.so.0.2609.1 7f4410a08000-7f4410aa4000 r-xp 00000000 08:17 1729026 /usr/lib/libgdk-x11-2.0.so.0.1600.1 7f4410aa4000-7f4410ca4000 ---p 0009c000 08:17 1729026 /usr/lib/libgdk-x11-2.0.so.0.1600.1 7f4410ca4000-7f4410ca9000 rw-p 0009c000 08:17 1729026 /usr/lib/libgdk-x11-2.0.so.0.1600.1 7f4410ca9000-7f4410dfd000 r-xp 00000000 08:17 1728532 /usr/lib/libxml2.so.2.7.3 7f4410dfd000-7f4410ffc000 ---p 00154000 08:17 1728532 /usr/lib/libxml2.so.2.7.3 7f4410ffc000-7f4411006000 rw-p 00153000 08:17 1728532 /usr/lib/libxml2.so.2.7.3 7f4411006000-7f4411007000 rw-p 7f4411006000 00:00 0 7f4411007000-7f44113f6000 r-xp 00000000 08:17 1729028 /usr/lib/libgtk-x11-2.0.so.0.1600.1 7f44113f6000-7f44115f5000 ---p 003ef000 08:17 1729028 /usr/lib/libgtk-x11-2.0.so.0.1600.1 7f44115f5000-7f4411600000 rw-p 003ee000 08:17 1729028 /usr/lib/libgtk-x11-2.0.so.0.1600.1 7f4411600000-7f4411602000 rw-p 7f4411600000 00:00 0 7f4411602000-7f441161a000 r-xp 00000000 08:17 1729243 /usr/lib/libglade-2.0.so.0.0.7 7f441161a000-7f4411819000 ---p 00018000 08:17 1729243 /usr/lib/libglade-2.0.so.0.0.7 7f4411819000-7f441181b000 rw-p 00017000 08:17 1729243 /usr/lib/libglade-2.0.so.0.0.7 7f441181b000-7f441181f000 r-xp 00000000 08:17 1729471 /usr/lib/libgthread-2.0.so.0.2000.1 7f441181f000-7f4411a1e000 ---p 00004000 08:17 1729471 /usr/lib/libgthread-2.0.so.0.2000.1 7f4411a1e000-7f4411a1f000 rw-p 00003000 08:17 1729471 /usr/lib/libgthread-2.0.so.0.2000.1 7f4411a2a000-7f4411a3f000 r--p 00000000 08:17 1204280 /usr/share/locale/pt_BR/LC_MESSAGES/libc.mo 7f4411a3f000-7f4411b55000 r-xp 00000000 08:17 1843529 /usr/lib/jni/libgtkjni-4.0.so 7f4411b55000-7f4411d55000 ---p 00116000 08:17 1843529 /usr/lib/jni/libgtkjni-4.0.so 7f4411d55000-7f4411d5c000 rw-p 00116000 08:17 1843529 /usr/lib/jni/libgtkjni-4.0.so 7f4411d5c000-7f4411d60000 r--s 00079000 08:17 1843935 /usr/lib/jvm/java-6-openjdk/jre/lib/jsse.jar 7f4411d60000-7f4411d84000 r--s 00111000 08:17 674048 /usr/share/java/gtk-4.0.jar 7f4411d84000-7f4411d8c000 r--s 00062000 08:17 672978 /usr/share/java/gnu-classpath-tools-gjdoc-0.7.9.jar 7f4411d8c000-7f4411d95000 r--s 00065000 08:17 674465 /usr/share/java/gnome-java-bridge.jar 7f4411d95000-7f4411d98000 r--s 00014000 08:17 674046 /usr/share/java/gnome2.12-2.12.7.jar 7f4411d98000-7f4411da1000 r--s 00065000 08:17 674465 /usr/share/java/gnome-java-bridge.jar 7f4411da1000-7f4411da4000 r--s 0000f000 08:17 1843934 /usr/lib/jvm/java-6-openjdk/jre/lib/ext/pulse-java.jar 7f4411da4000-7f4411da5000 ---p 7f4411da4000 00:00 0 7f4411da5000-7f4411ea5000 rwxp 7f4411da5000 00:00 0 7f4411ea5000-7f4411ea8000 ---p 7f4411ea5000 00:00 0 7f4411ea8000-7f4411fa6000 rwxp 7f4411ea8000 00:00 0 7f4411fa6000-7f4411fa9000 ---p 7f4411fa6000 00:00 0 7f4411fa9000-7f44120a7000 rwxp 7f4411fa9000 00:00 0 7f44120a7000-7f44120aa000 ---p 7f44120a7000 00:00 0 7f44120aa000-7f44121a8000 rwxp 7f44120aa000 00:00 0 7f44121a8000-7f44121ab000 ---p 7f44121a8000 00:00 0 7f44121ab000-7f44122a9000 rwxp 7f44121ab000 00:00 0 7f44122a9000-7f44123eb000 r--p 00000000 08:17 1730253 /usr/lib/locale/locale-archive 7f44123eb000-7f44123ee000 ---p 7f44123eb000 00:00 0 7f44123ee000-7f44124ec000 rwxp 7f44123ee000 00:00 0 7f44124ec000-7f44124ef000 ---p 7f44124ec000 00:00 0 7f44124ef000-7f44125ed000 rwxp 7f44124ef000 00:00 0 7f44125ed000-7f44125ee000 ---p 7f44125ed000 00:00 0 7f44125ee000-7f44126ee000 rwxp 7f44125ee000 00:00 0 7f44126ee000-7f44127c6000 rw-p 7f44126ee000 00:00 0 7f44127c6000-7f4412956000 r--s 03840000 08:17 1843626 /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar 7f4412956000-7f4412957000 ---p 7f4412956000 00:00 0 7f4412957000-7f4412a57000 rwxp 7f4412957000 00:00 0 7f4412a57000-7f4412a58000 ---p 7f4412a57000 00:00 0 7f4412a58000-7f4412b58000 rwxp 7f4412a58000 00:00 0 7f4412b58000-7f4412b59000 ---p 7f4412b58000 00:00 0 7f4412b59000-7f4412c59000 rwxp 7f4412b59000 00:00 0 7f4412c59000-7f4412c5a000 ---p 7f4412c59000 00:00 0 7f4412c5a000-7f4412d65000 rwxp 7f4412c5a000 00:00 0 7f4412d65000-7f4412dae000 rwxp 7f4412d65000 00:00 0 7f4412dae000-7f4412dc2000 rwxp 7f4412dae000 00:00 0 7f4412dc2000-7f4412ee0000 rwxp 7f4412dc2000 00:00 0 7f4412ee0000-7f4412eeb000 rwxp 7f4412ee0000 00:00 0 7f4412eeb000-7f4412f34000 rwxp 7f4412eeb000 00:00 0 7f4412f34000-7f4412f48000 rwxp 7f4412f34000 00:00 0 7f4412f48000-7f4413066000 rwxp 7f4412f48000 00:00 0 7f4413066000-7f4413070000 rwxp 7f4413066000 00:00 0 7f4413070000-7f44130ff000 rwxp 7f4413070000 00:00 0 7f44130ff000-7f44145c0000 rwxp 7f44130ff000 00:00 0 7f44145c0000-7f441d900000 rwxp 7f44145c0000 00:00 0 7f441d900000-7f441ff40000 rwxp 7f441d900000 00:00 0 7f441ff40000-7f4443d00000 rwxp 7f441ff40000 00:00 0 7f4443d00000-7f4445020000 rwxp 7f4443d00000 00:00 0 7f4445020000-7f4456f00000 rwxp 7f4445020000 00:00 0 7f4456f07000-7f4457177000 rwxp 7f4456f07000 00:00 0 7f4457177000-7f4459f07000 rwxp 7f4457177000 00:00 0 7f4459f07000-7f4459f0e000 r-xp 00000000 08:17 1843941 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libzip.so 7f4459f0e000-7f445a10d000 ---p 00007000 08:17 1843941 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libzip.so 7f445a10d000-7f445a10e000 rw-p 00006000 08:17 1843941 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libzip.so 7f445a10e000-7f445a119000 r-xp 00000000 08:11 1540348 /lib/libnss_files-2.9.so 7f445a119000-7f445a318000 ---p 0000b000 08:11 1540348 /lib/libnss_files-2.9.so 7f445a318000-7f445a319000 r--p 0000a000 08:11 1540348 /lib/libnss_files-2.9.so 7f445a319000-7f445a31a000 rw-p 0000b000 08:11 1540348 /lib/libnss_files-2.9.so 7f445a31a000-7f445a324000 r-xp 00000000 08:11 1540218 /lib/libnss_nis-2.9.so 7f445a324000-7f445a523000 ---p 0000a000 08:11 1540218 /lib/libnss_nis-2.9.so 7f445a523000-7f445a524000 r--p 00009000 08:11 1540218 /lib/libnss_nis-2.9.so 7f445a524000-7f445a525000 rw-p 0000a000 08:11 1540218 /lib/libnss_nis-2.9.so 7f445a525000-7f445a52c000 r-xp 00000000 08:11 1540204 /lib/libnss_compat-2.9.so 7f445a52c000-7f445a72b000 ---p 00007000 08:11 1540204 /lib/libnss_compat-2.9.so 7f445a72b000-7f445a72c000 r--p 00006000 08:11 1540204 /lib/libnss_compat-2.9.so 7f445a72c000-7f445a72d000 rw-p 00007000 08:11 1540204 /lib/libnss_compat-2.9.so 7f445a72d000-7f445a735000 r-xp 00000000 08:17 1844351 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/native_threads/libhpi.so 7f445a735000-7f445a934000 ---p 00008000 08:17 1844351 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/native_threads/libhpi.so 7f445a934000-7f445a936000 rw-p 00007000 08:17 1844351 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/native_threads/libhpi.so 7f445a936000-7f445a94b000 r-xp 00000000 08:11 1540349 /lib/libnsl-2.9.so 7f445a94b000-7f445ab4a000 ---p 00015000 08:11 1540349 /lib/libnsl-2.9.so 7f445ab4a000-7f445ab4b000 r--p 00014000 08:11 1540349 /lib/libnsl-2.9.so 7f445ab4b000-7f445ab4c000 rw-p 00015000 08:11 1540349 /lib/libnsl-2.9.so 7f445ab4c000-7f445ab4e000 rw-p 7f445ab4c000 00:00 0 7f445ab4e000-7f445ab7b000 r-xp 00000000 08:17 1843945 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libjava.so 7f445ab7b000-7f445ad7a000 ---p 0002d000 08:17 1843945 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libjava.so 7f445ad7a000-7f445ad7e000 rw-p 0002c000 08:17 1843945 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libjava.so 7f445ad7e000-7f445ad8d000 r-xp 00000000 08:17 1843633 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libverify.so 7f445ad8d000-7f445af8c000 ---p 0000f000 08:17 1843633 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libverify.so 7f445af8c000-7f445af8e000 rw-p 0000e000 08:17 1843633 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libverify.so 7f445af8e000-7f445af95000 r-xp 00000000 08:11 1540205 /lib/librt-2.9.so 7f445af95000-7f445b194000 ---p 00007000 08:11 1540205 /lib/librt-2.9.so 7f445b194000-7f445b195000 r--p 00006000 08:11 1540205 /lib/librt-2.9.so 7f445b195000-7f445b196000 rw-p 00007000 08:11 1540205 /lib/librt-2.9.so 7f445b196000-7f445b218000 r-xp 00000000 08:11 1540201 /lib/libm-2.9.so 7f445b218000-7f445b417000 ---p 00082000 08:11 1540201 /lib/libm-2.9.so 7f445b417000-7f445b418000 r--p 00081000 08:11 1540201 /lib/libm-2.9.so 7f445b418000-7f445b419000 rw-p 00082000 08:11 1540201 /lib/libm-2.9.so 7f445b419000-7f445bbd7000 r-xp 00000000 08:17 1843938 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server/libjvm.so 7f445bbd7000-7f445bdd6000 ---p 007be000 08:17 1843938 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server/libjvm.so 7f445bdd6000-7f445be5d000 rw-p 007bd000 08:17 1843938 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server/libjvm.so 7f445be5d000-7f445be97000 rw-p 7f445be5d000 00:00 0 7f445be97000-7f445bfe0000 r-xp 00000000 08:11 1540198 /lib/libc-2.9.so 7f445bfe0000-7f445c1e0000 ---p 00149000 08:11 1540198 /lib/libc-2.9.so 7f445c1e0000-7f445c1e4000 r--p 00149000 08:11 1540198 /lib/libc-2.9.so 7f445c1e4000-7f445c1e5000 rw-p 0014d000 08:11 1540198 /lib/libc-2.9.so 7f445c1e5000-7f445c1ea000 rw-p 7f445c1e5000 00:00 0 7f445c1ea000-7f445c1ec000 r-xp 00000000 08:11 1540345 /lib/libdl-2.9.so 7f445c1ec000-7f445c3ec000 ---p 00002000 08:11 1540345 /lib/libdl-2.9.so 7f445c3ec000-7f445c3ed000 r--p 00002000 08:11 1540345 /lib/libdl-2.9.so 7f445c3ed000-7f445c3ee000 rw-p 00003000 08:11 1540345 /lib/libdl-2.9.so 7f445c3ee000-7f445c3f2000 r-xp 00000000 08:17 1843636 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli/libjli.so 7f445c3f2000-7f445c5f1000 ---p 00004000 08:17 1843636 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli/libjli.so 7f445c5f1000-7f445c5f2000 rw-p 00003000 08:17 1843636 /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli/libjli.so 7f445c5f2000-7f445c608000 r-xp 00000000 08:11 1540202 /lib/libpthread-2.9.so 7f445c608000-7f445c807000 ---p 00016000 08:11 1540202 /lib/libpthread-2.9.so 7f445c807000-7f445c808000 r--p 00015000 08:11 1540202 /lib/libpthread-2.9.so 7f445c808000-7f445c809000 rw-p 00016000 08:11 1540202 /lib/libpthread-2.9.so 7f445c809000-7f445c80d000 rw-p 7f445c809000 00:00 0 7f445c80d000-7f445c824000 r-xp 00000000 08:17 1729444 /usr/lib/libz.so.1.2.3.3 7f445c824000-7f445ca23000 ---p 00017000 08:17 1729444 /usr/lib/libz.so.1.2.3.3 7f445ca23000-7f445ca24000 rw-p 00016000 08:17 1729444 /usr/lib/libz.so.1.2.3.3 7f445ca24000-7f445ca41000 r-xp 00000000 08:11 1540137 /lib/ld-2.9.so 7f445ca42000-7f445ca44000 r--s 00005000 08:17 673806 /usr/share/java/glib0.4-0.4.2.jar 7f445ca44000-7f445ca51000 r--s 0009a000 08:17 674044 /usr/share/java/gtk2.10-2.10.2.jar 7f445ca51000-7f445ca58000 r--s 00000000 08:17 1729493 /usr/lib/gconv/gconv-modules.cache 7f445ca58000-7f445ca62000 rwxp 7f445ca58000 00:00 0 7f445ca62000-7f445cb18000 rwxp 7f445ca62000 00:00 0 7f445cb18000-7f445cb1b000 ---p 7f445cb18000 00:00 0 7f445cb1b000-7f445cc19000 rwxp 7f445cb1b000 00:00 0 7f445cc19000-7f445cc1d000 rw-p 7f445cc19000 00:00 0 7f445cc1f000-7f445cc21000 r--s 00007000 08:17 674101 /usr/share/java/glade2.12-2.12.8.jar 7f445cc21000-7f445cc33000 r--p 00000000 08:17 1204296 /usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo 7f445cc33000-7f445cc3b000 rw-s 00000000 08:11 1384488 /tmp/hsperfdata_saulo/15515 7f445cc3b000-7f445cc3c000 rw-p 7f445cc3b000 00:00 0 7f445cc3c000-7f445cc3d000 r--p 7f445cc3c000 00:00 0 7f445cc3d000-7f445cc40000 rw-p 7f445cc3d000 00:00 0 7f445cc40000-7f445cc41000 r--p 0001c000 08:11 1540137 /lib/ld-2.9.so 7f445cc41000-7f445cc42000 rw-p 0001d000 08:11 1540137 /lib/ld-2.9.so 7fff64c2c000-7fff64c40000 rwxp 7ffffffea000 00:00 0 [stack] 7fff64c40000-7fff64c41000 rw-p 7fffffffe000 00:00 0 7fff64dfe000-7fff64dff000 r-xp 7fff64dfe000 00:00 0 [vdso] ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall] VM Arguments: jvm_args: -Dfile.encoding=UTF-8 java_command: MainApp Launcher Type: SUN_STANDARD Environment Variables: PATH=/usr/local/bin:/usr/bin:/bin:/usr/games LD_LIBRARY_PATH=/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64:/usr/lib/jvm/java-6-openjdk/jre/../lib/amd64:/usr/lib64/xulrunner-devel-1.9 SHELL=/bin/bash DISPLAY=:0 Signal Handlers: SIGSEGV: [libjvm.so+0x670080], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x670080], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x54ae90], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: [libjvm.so+0x54ae90], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGXFSZ: [libjvm.so+0x54ae90], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x54ae90], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x54a610], sa_mask[0]=0x00000004, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x54c860], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: [libjvm.so+0x54c860], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGTERM: [libjvm.so+0x54c860], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x54c860], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:squeeze/sid uname:Linux 2.6.26.8-rt12 #1 SMP PREEMPT RT Wed Jan 7 19:14:10 BRST 2009 x86_64 libc:glibc 2.9 NPTL 2.9 rlimit: STACK 8192k, CORE 0k, NPROC infinity, NOFILE 1024, AS infinity load average:0,67 0,66 0,82 CPU:total 4 (4 cores per cpu, 1 threads per core) family 16 model 2 stepping 3, cmov, cx8, fxsr, mmx, sse, sse2, sse3, mmxext, 3dnow, 3dnowext, sse4a Memory: 4k page, physical 3757836k(406300k free), swap 4610612k(4610612k free) vm_info: OpenJDK 64-Bit Server VM (14.0-b10) for linux-amd64 JRE (1.6.0_0-b14), built on Mar 19 2009 18:31:44 by "doko" with gcc 4.3.3 time: Fri May 15 23:37:31 2009 elapsed time: 0 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 Joe.Darcy at Sun.COM Fri May 15 21:58:05 2009 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Fri, 15 May 2009 21:58:05 -0700 Subject: HotSpot 14 In-Reply-To: <4A0DB792.4020701@sun.com> References: <17c6771e0905151101g7413db57lcbcba7640af658c@mail.gmail.com> <4A0DB273.9060908@sun.com> <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> <4A0DB792.4020701@sun.com> Message-ID: <4A0E47DD.6000804@sun.com> Hello. Erik Trimble wrote: > Andrew John Hughes wrote: >> 2009/5/15 Erik Trimble : >> >>> Andrew John Hughes wrote: >>> >>>> Hi all (especially Joe), >>>> >>>> Now that the HotSpot Express repositories are available, what is the >>>> plan for including hs14 in OpenJDK6? >>>> >>>> I did a pull of the base changeset from HS express (0) into OpenJDK6's >>>> hotspot repo. yesterday as a test, and it seems to apply fairly well. >>>> The conflicts all seem to be whitespace changes (though there's a lot >>>> of them -- ~210 files are affected). >>>> >>>> Do we still plan to maintain a version of HotSpot in OpenJDK6 or will >>>> HS Express just be used directly? >>>> >>>> Thanks, >>>> >>>> >>> Frankly, I think this is up to the Community. >>> >>> I'm still not 100% sure of the complete list of who has write access >>> to the >>> OpenJDK6 stuff, but I /think/ the proper way to do this is not move >>> any HSX >>> release into the main OpenJDK6 forest until there is consensus that >>> It's >>> Time. >>> >>> >> >> The list is here: http://db.openjdk.java.net/people for your >> delectation and delight. >> >> > Thanks! > > >>> Now, that said, maybe It's Time Right Now. >>> >>> >> >> IcedTea (i.e. the version of OpenJDK6 people are actually using on >> their distros today) has already been shipping HotSpot 14 for some >> time. So I think not only is the time right for OpenJDK6 upstream to >> also upgrade, but that it's perhaps long overdue. >> >> > I'll check with Joe, but I think it's on my to-do list to push HSX14 > to OpenJDK sometime before JavaOne. That sounds good to me, modulo my preferences below... >>> Given that the HSX repos are going to be almost exclusively Sun-only >>> writable (in practice, not necessarily by design), I think that the >>> VM in >>> OpenJDK6 should be pulled from an HSX repo, and then have various >>> community-desired patches applied there, rather than try to work >>> directly on >>> an HSX repo. That is, I expect the various HSX repos to be a >>> reflection of >>> what Sun is doing, and the VM in OpenJDK6 should be a reflection of >>> what the >>> Community chooses to do with the HSX work from Sun. >>> >>> >> >> My preference would be for patches to go into HotSpot Express and then >> OpenJDK6 just pull a stable version regularly. I've already had >> patches committed to HotSpot as have others working on IcedTea, so I >> don't see an issue there. >> > > Well, this needs further discussion. There's still some conflict here > as to whether or not we're going to ship the Sun JDK 6 Update release > train as a superset of the OpenJDK6 + HSX repositories, or if there > will be things in those open repos that we exclude from the Sun JDK6 > Updates. > > If the first case is what is happening (i.e. Sun's JDK is a superset > of OpenJDK6+HSX), then, yes, we (that is, the entire Community+Sun) > should just patch the appropriate HSX repo, and periodically pull it > over into the OpenJDK6 forest after stabilization. If, on the other > hand, the second case is what is To Be, then only certain > community-submitted patches will be integrated into HSX, which means > that the actual development of Hotspot for OpenJDK6 will have to > happen in the OpenJDK6 forest directly. In essence, if we chose the > 2nd case, there will need to be 3 VM repositories: HSX for the stuff > that's going to be the Sun JDK6 release, IceTea for the patches to the > HSX repository that aren't going into Sun's JDK, and OpenJDK6, which > is HSX+IceTea (stabilized). > In my estimation, the fixes desirable in a HS repository being used for Sun JDK stabilization and the fixes desirable for a HS repository being used for OpenJDK 6 and for IcedTea 6 are fundamentally the same in all cases: a stable HotSpot that runs fast enough. Around the margins, there may be some issues around if a particular patch is appropriate for the upstream sources, but the IcedTea HotSpot patches I've seen to fix things like build issues seem innocuous and appropriate for upstream to me. My preference is essentially combining the HSX and OpenJDK 6 HS repositories; i.e. the OpenJDK 6 HS repository is the HSX stabilization repo. The alternative of periodically syncing HSX into OpenJDK 6 is possible too, but strikes me as a little extra work when we could just as easily tag or otherwise publicize "we think this version of the repo is good." The IcedTea HS patches could continue as needed, especially timing wise when release deadlines don't line up, but I think we should be able to get much less skew between the HotSpot in IcedTea and the stabilized HS in OpenJDK 6/HSX, which should bring benefits all around by getting more testing on (nearly) the same code base. -Joe From Jonathan.Gibbons at Sun.COM Sat May 16 07:19:40 2009 From: Jonathan.Gibbons at Sun.COM (Jonathan Gibbons) Date: Sat, 16 May 2009 07:19:40 -0700 Subject: HotSpot 14 In-Reply-To: <4A0E47DD.6000804@sun.com> References: <17c6771e0905151101g7413db57lcbcba7640af658c@mail.gmail.com> <4A0DB273.9060908@sun.com> <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> <4A0DB792.4020701@sun.com> <4A0E47DD.6000804@sun.com> Message-ID: On May 15, 2009, at 9:58 PM, Joseph D. Darcy wrote: > Hello. > > Erik Trimble wrote: >> Andrew John Hughes wrote: >>> 2009/5/15 Erik Trimble : >>> >>>> Andrew John Hughes wrote: >>>> >>>>> Hi all (especially Joe), >>>>> >>>>> Now that the HotSpot Express repositories are available, what is >>>>> the >>>>> plan for including hs14 in OpenJDK6? >>>>> >>>>> I did a pull of the base changeset from HS express (0) into >>>>> OpenJDK6's >>>>> hotspot repo. yesterday as a test, and it seems to apply fairly >>>>> well. >>>>> The conflicts all seem to be whitespace changes (though there's >>>>> a lot >>>>> of them -- ~210 files are affected). >>>>> >>>>> Do we still plan to maintain a version of HotSpot in OpenJDK6 or >>>>> will >>>>> HS Express just be used directly? >>>>> >>>>> Thanks, >>>>> >>>>> >>>> Frankly, I think this is up to the Community. >>>> >>>> I'm still not 100% sure of the complete list of who has write >>>> access to the >>>> OpenJDK6 stuff, but I /think/ the proper way to do this is not >>>> move any HSX >>>> release into the main OpenJDK6 forest until there is consensus >>>> that It's >>>> Time. >>>> >>>> >>> >>> The list is here: http://db.openjdk.java.net/people for your >>> delectation and delight. >>> >>> >> Thanks! >> >> >>>> Now, that said, maybe It's Time Right Now. >>>> >>>> >>> >>> IcedTea (i.e. the version of OpenJDK6 people are actually using on >>> their distros today) has already been shipping HotSpot 14 for some >>> time. So I think not only is the time right for OpenJDK6 upstream >>> to >>> also upgrade, but that it's perhaps long overdue. >>> >>> >> I'll check with Joe, but I think it's on my to-do list to push >> HSX14 to OpenJDK sometime before JavaOne. > > That sounds good to me, modulo my preferences below... > >>>> Given that the HSX repos are going to be almost exclusively Sun- >>>> only >>>> writable (in practice, not necessarily by design), I think that >>>> the VM in >>>> OpenJDK6 should be pulled from an HSX repo, and then have various >>>> community-desired patches applied there, rather than try to work >>>> directly on >>>> an HSX repo. That is, I expect the various HSX repos to be a >>>> reflection of >>>> what Sun is doing, and the VM in OpenJDK6 should be a reflection >>>> of what the >>>> Community chooses to do with the HSX work from Sun. >>>> >>>> >>> >>> My preference would be for patches to go into HotSpot Express and >>> then >>> OpenJDK6 just pull a stable version regularly. I've already had >>> patches committed to HotSpot as have others working on IcedTea, so I >>> don't see an issue there. >>> >> >> Well, this needs further discussion. There's still some conflict >> here as to whether or not we're going to ship the Sun JDK 6 Update >> release train as a superset of the OpenJDK6 + HSX repositories, or >> if there will be things in those open repos that we exclude from >> the Sun JDK6 Updates. >> >> If the first case is what is happening (i.e. Sun's JDK is a >> superset of OpenJDK6+HSX), then, yes, we (that is, the entire >> Community+Sun) should just patch the appropriate HSX repo, and >> periodically pull it over into the OpenJDK6 forest after >> stabilization. If, on the other hand, the second case is what is >> To Be, then only certain community-submitted patches will be >> integrated into HSX, which means that the actual development of >> Hotspot for OpenJDK6 will have to happen in the OpenJDK6 forest >> directly. In essence, if we chose the 2nd case, there will need to >> be 3 VM repositories: HSX for the stuff that's going to be the >> Sun JDK6 release, IceTea for the patches to the HSX repository that >> aren't going into Sun's JDK, and OpenJDK6, which is HSX+IceTea >> (stabilized). >> > > In my estimation, the fixes desirable in a HS repository being used > for Sun JDK stabilization and the fixes desirable for a HS > repository being used for OpenJDK 6 and for IcedTea 6 are > fundamentally the same in all cases: a stable HotSpot that runs fast > enough. Around the margins, there may be some issues around if a > particular patch is appropriate for the upstream sources, but the > IcedTea HotSpot patches I've seen to fix things like build issues > seem innocuous and appropriate for upstream to me. > > My preference is essentially combining the HSX and OpenJDK 6 HS > repositories; i.e. the OpenJDK 6 HS repository is the HSX > stabilization repo. The alternative of periodically syncing HSX > into OpenJDK 6 is possible too, but strikes me as a little extra > work when we could just as easily tag or otherwise publicize "we > think this version of the repo is good." The IcedTea HS patches > could continue as needed, especially timing wise when release > deadlines don't line up, but I think we should be able to get much > less skew between the HotSpot in IcedTea and the stabilized HS in > OpenJDK 6/HSX, which should bring benefits all around by getting > more testing on (nearly) the same code base. > > -Joe Joe, Architecturally, this seems to bring up an interesting point. Currently we build a set of "co-located" repositories -- i.e. a Mercurial forest. You are somewhat suggesting we break this paradigm, by using a tree (HotSpot) which is not directly within the forest. If we can figure out how to do that, then maybe we would also be able to use the same mechanism to handle corba/jaxws, jaxp, etc, which do not naturally live within our forests. Maybe the top level repo could have optional Makefile targets to get copies of the latest preferred copies of these "imported" repositories. They would be "optional" in that they would be available for a user to invoke if they wanted to access and build using the imported repository, as compared to using the existing mechanism for importing built bits from an earlier build. -- Jon From Joe.Darcy at Sun.COM Sat May 16 08:13:00 2009 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Sat, 16 May 2009 08:13:00 -0700 Subject: HotSpot 14 In-Reply-To: References: <17c6771e0905151101g7413db57lcbcba7640af658c@mail.gmail.com> <4A0DB273.9060908@sun.com> <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> <4A0DB792.4020701@sun.com> <4A0E47DD.6000804@sun.com> Message-ID: <4A0ED7FC.9060007@sun.com> Jonathan Gibbons wrote: > On May 15, 2009, at 9:58 PM, Joseph D. Darcy wrote: > >> Hello. >> >> Erik Trimble wrote: >>> Andrew John Hughes wrote: >>>> 2009/5/15 Erik Trimble : >>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>>> Hi all (especially Joe), >>>>>> >>>>>> Now that the HotSpot Express repositories are available, what is the >>>>>> plan for including hs14 in OpenJDK6? >>>>>> >>>>>> I did a pull of the base changeset from HS express (0) into >>>>>> OpenJDK6's >>>>>> hotspot repo. yesterday as a test, and it seems to apply fairly >>>>>> well. >>>>>> The conflicts all seem to be whitespace changes (though there's a >>>>>> lot >>>>>> of them -- ~210 files are affected). >>>>>> >>>>>> Do we still plan to maintain a version of HotSpot in OpenJDK6 or >>>>>> will >>>>>> HS Express just be used directly? >>>>>> >>>>>> Thanks, >>>>>> >>>>>> >>>>> Frankly, I think this is up to the Community. >>>>> >>>>> I'm still not 100% sure of the complete list of who has write >>>>> access to the >>>>> OpenJDK6 stuff, but I /think/ the proper way to do this is not >>>>> move any HSX >>>>> release into the main OpenJDK6 forest until there is consensus >>>>> that It's >>>>> Time. >>>>> >>>>> >>>> >>>> The list is here: http://db.openjdk.java.net/people for your >>>> delectation and delight. >>>> >>>> >>> Thanks! >>> >>> >>>>> Now, that said, maybe It's Time Right Now. >>>>> >>>>> >>>> >>>> IcedTea (i.e. the version of OpenJDK6 people are actually using on >>>> their distros today) has already been shipping HotSpot 14 for some >>>> time. So I think not only is the time right for OpenJDK6 upstream to >>>> also upgrade, but that it's perhaps long overdue. >>>> >>>> >>> I'll check with Joe, but I think it's on my to-do list to push HSX14 >>> to OpenJDK sometime before JavaOne. >> >> That sounds good to me, modulo my preferences below... >> >>>>> Given that the HSX repos are going to be almost exclusively Sun-only >>>>> writable (in practice, not necessarily by design), I think that >>>>> the VM in >>>>> OpenJDK6 should be pulled from an HSX repo, and then have various >>>>> community-desired patches applied there, rather than try to work >>>>> directly on >>>>> an HSX repo. That is, I expect the various HSX repos to be a >>>>> reflection of >>>>> what Sun is doing, and the VM in OpenJDK6 should be a reflection >>>>> of what the >>>>> Community chooses to do with the HSX work from Sun. >>>>> >>>>> >>>> >>>> My preference would be for patches to go into HotSpot Express and then >>>> OpenJDK6 just pull a stable version regularly. I've already had >>>> patches committed to HotSpot as have others working on IcedTea, so I >>>> don't see an issue there. >>>> >>> >>> Well, this needs further discussion. There's still some conflict >>> here as to whether or not we're going to ship the Sun JDK 6 Update >>> release train as a superset of the OpenJDK6 + HSX repositories, or >>> if there will be things in those open repos that we exclude from the >>> Sun JDK6 Updates. >>> >>> If the first case is what is happening (i.e. Sun's JDK is a superset >>> of OpenJDK6+HSX), then, yes, we (that is, the entire Community+Sun) >>> should just patch the appropriate HSX repo, and periodically pull it >>> over into the OpenJDK6 forest after stabilization. If, on the >>> other hand, the second case is what is To Be, then only certain >>> community-submitted patches will be integrated into HSX, which means >>> that the actual development of Hotspot for OpenJDK6 will have to >>> happen in the OpenJDK6 forest directly. In essence, if we chose the >>> 2nd case, there will need to be 3 VM repositories: HSX for the >>> stuff that's going to be the Sun JDK6 release, IceTea for the >>> patches to the HSX repository that aren't going into Sun's JDK, and >>> OpenJDK6, which is HSX+IceTea (stabilized). >>> >> >> In my estimation, the fixes desirable in a HS repository being used >> for Sun JDK stabilization and the fixes desirable for a HS repository >> being used for OpenJDK 6 and for IcedTea 6 are fundamentally the same >> in all cases: a stable HotSpot that runs fast enough. Around the >> margins, there may be some issues around if a particular patch is >> appropriate for the upstream sources, but the IcedTea HotSpot patches >> I've seen to fix things like build issues seem innocuous and >> appropriate for upstream to me. >> >> My preference is essentially combining the HSX and OpenJDK 6 HS >> repositories; i.e. the OpenJDK 6 HS repository is the HSX >> stabilization repo. The alternative of periodically syncing HSX into >> OpenJDK 6 is possible too, but strikes me as a little extra work when >> we could just as easily tag or otherwise publicize "we think this >> version of the repo is good." The IcedTea HS patches could continue >> as needed, especially timing wise when release deadlines don't line >> up, but I think we should be able to get much less skew between the >> HotSpot in IcedTea and the stabilized HS in OpenJDK 6/HSX, which >> should bring benefits all around by getting more testing on (nearly) >> the same code base. >> >> -Joe > > > Joe, > > Architecturally, this seems to bring up an interesting point. > Currently we build a set of "co-located" repositories -- i.e. a > Mercurial forest. You are somewhat suggesting we break this paradigm, > by using a tree (HotSpot) which is not directly within the forest. If > we can figure out how to do that, then maybe we would also be able to > use the same mechanism to handle corba/jaxws, jaxp, etc, which do not > naturally live within our forests. For HotSpot, another way to implement this approach is to sync HS 14 into OpenJDK 6 and then do whatever would have been done in the new HSX repo in the existing OpenJDK 6 repo. For corba, jaxp, and jaxws which are effectively maintained elsewhere, later this year I want to explore going to a model where those files are *not* tracked under version control in the JDK, rather the teams in question would periodically sent us known-good source tar-balls, or some equivalent bundle of code. Any JDK-specific changes could be tracked under version control and applied locally as patches until the changes go upstream. Given how well this model works for IcedTea working with OpenJDK, I'm confident it can also work for the JDK's incorporation of corba, jaxp, and jaxws :-) -Joe From doko at ubuntu.com Sun May 17 13:38:58 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Sun, 17 May 2009 20:38:58 +0000 Subject: changeset in /hg/icedtea6: 2009-05-17 Matthias Klose changeset 2855ab5fe0e7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2855ab5fe0e7 description: 2009-05-17 Matthias Klose Revert patch breaking build using gcj: 2009-05-15 Lillian Angel * Makefile.am (ICEDTEA_PATCHES): patches/icedtea-tools.patch and patches/icedtea-javafiles.patch removed from list. * patches/icedtea-tools.patch, patches/icedtea-javafiles.patch: Removed. * HACKING: Updated. diffstat: 5 files changed, 256 insertions(+), 2 deletions(-) ChangeLog | 12 ++ HACKING | 4 Makefile.am | 2 patches/icedtea-javafiles.patch | 157 +++++++++++++++++++++++++++++++++++++++ patches/icedtea-tools.patch | 83 ++++++++++++++++++++ diffs (311 lines): diff -r 408be9d00bfe -r 2855ab5fe0e7 ChangeLog --- a/ChangeLog Fri May 15 16:35:35 2009 -0400 +++ b/ChangeLog Sun May 17 22:34:16 2009 +0200 @@ -1,3 +1,15 @@ 2009-05-15 Deepak Bhole + + Revert patch breaking build using gcj: + + 2009-05-15 Lillian Angel + * Makefile.am + (ICEDTEA_PATCHES): patches/icedtea-tools.patch and + patches/icedtea-javafiles.patch removed from list. + * patches/icedtea-tools.patch, + patches/icedtea-javafiles.patch: Removed. + * HACKING: Updated. + 2009-05-15 Deepak Bhole * Makefile.am: Wire in new plugin build. diff -r 408be9d00bfe -r 2855ab5fe0e7 HACKING --- a/HACKING Fri May 15 16:35:35 2009 -0400 +++ b/HACKING Sun May 17 22:34:16 2009 +0200 @@ -30,6 +30,7 @@ The following patches are currently appl * icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649) * icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64. * icedtea-javac-debuginfo.patch: Ensure debugging information is generated for all class files. +* icedtea-javafiles.patch: Add missing Java files to list. * icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support. * icedtea-lcms: Applies security patch. * icedtea-lcms-2.patch: Temporary fix for https://bugs.openjdk.java.net/show_bug.cgi?id=100050. @@ -50,6 +51,7 @@ The following patches are currently appl * icedtea-sunsrc.patch: Remove service property files from TOOLS list. * icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms. * icedtea-timerqueue.patch: Fix setting of running variable (PR87). +* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti. * icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486). * icedtea-version.patch: Replace name and bug URL with IcedTea versions. * icedtea-webservices.patch: Add applet support. @@ -162,5 +164,3 @@ changes to the OpenJDK code base and/or * icedtea-core-zero-build.patch: Not required with HS14. * icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14. * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. Not required with HS14. -* icedtea-javafiles.patch: Add missing Java files to list. -* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti. diff -r 408be9d00bfe -r 2855ab5fe0e7 Makefile.am --- a/Makefile.am Fri May 15 16:35:35 2009 -0400 +++ b/Makefile.am Sun May 17 22:34:16 2009 +0200 @@ -507,6 +507,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-webstart.patch \ patches/icedtea-webstart-umask.patch \ patches/icedtea-rmi_amd64.patch \ + patches/icedtea-tools.patch \ patches/icedtea-demos.patch \ patches/icedtea-timezone.patch \ patches/icedtea-use-system-tzdata.patch \ @@ -520,6 +521,7 @@ ICEDTEA_PATCHES = \ patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ patches/icedtea-sunsrc.patch \ patches/icedtea-libraries.patch \ + patches/icedtea-javafiles.patch \ patches/icedtea-core-build.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-lcms.patch \ diff -r 408be9d00bfe -r 2855ab5fe0e7 patches/icedtea-javafiles.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-javafiles.patch Sun May 17 22:34:16 2009 +0200 @@ -0,0 +1,157 @@ +--- openjdk/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200 ++++ openjdk/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200 +@@ -29,6 +29,80 @@ + # will generate header files + # + JAVA_JAVA_java = \ ++ java/lang/reflect/AccessibleObject.java \ ++ java/lang/reflect/AnnotatedElement.java \ ++ java/lang/reflect/Array.java \ ++ java/lang/reflect/Constructor.java \ ++ java/lang/reflect/Field.java \ ++ java/lang/reflect/GenericArrayType.java \ ++ java/lang/reflect/GenericDeclaration.java \ ++ java/lang/reflect/GenericSignatureFormatError.java \ ++ java/lang/reflect/InvocationHandler.java \ ++ java/lang/reflect/InvocationTargetException.java \ ++ java/lang/reflect/MalformedParameterizedTypeException.java \ ++ java/lang/reflect/Member.java \ ++ java/lang/reflect/Method.java \ ++ java/lang/reflect/Modifier.java \ ++ java/lang/reflect/package-info.java \ ++ java/lang/reflect/ParameterizedType.java \ ++ java/lang/reflect/Proxy.java \ ++ java/lang/reflect/ReflectAccess.java \ ++ java/lang/reflect/ReflectPermission.java \ ++ java/lang/reflect/Type.java \ ++ java/lang/reflect/TypeVariable.java \ ++ java/lang/reflect/UndeclaredThrowableException.java \ ++ java/lang/reflect/WildcardType.java \ ++ java/lang/ref/Finalizer.java \ ++ java/lang/ref/FinalReference.java \ ++ java/lang/ref/PhantomReference.java \ ++ java/lang/ref/Reference.java \ ++ java/lang/ref/ReferenceQueue.java \ ++ java/lang/ref/SoftReference.java \ ++ java/lang/ref/WeakReference.java \ ++ java/lang/management/ClassLoadingMXBean.java \ ++ java/lang/management/CompilationMXBean.java \ ++ java/lang/management/GarbageCollectorMXBean.java \ ++ java/lang/management/LockInfo.java \ ++ java/lang/management/ManagementFactory.java \ ++ java/lang/management/ManagementPermission.java \ ++ java/lang/management/MemoryManagerMXBean.java \ ++ java/lang/management/MemoryMXBean.java \ ++ java/lang/management/MemoryNotificationInfo.java \ ++ java/lang/management/MemoryPoolMXBean.java \ ++ java/lang/management/MemoryType.java \ ++ java/lang/management/MemoryUsage.java \ ++ java/lang/management/MonitorInfo.java \ ++ java/lang/management/OperatingSystemMXBean.java \ ++ java/lang/management/RuntimeMXBean.java \ ++ java/lang/management/ThreadInfo.java \ ++ java/lang/management/ThreadMXBean.java \ ++ java/lang/instrument/ClassDefinition.java \ ++ java/lang/instrument/ClassFileTransformer.java \ ++ java/lang/instrument/IllegalClassFormatException.java \ ++ java/lang/instrument/Instrumentation.java \ ++ java/lang/instrument/UnmodifiableClassException.java \ ++ java/lang/annotation/AnnotationFormatError.java \ ++ java/lang/annotation/Annotation.java \ ++ java/lang/annotation/AnnotationTypeMismatchException.java \ ++ java/lang/annotation/Documented.java \ ++ java/lang/annotation/ElementType.java \ ++ java/lang/annotation/IncompleteAnnotationException.java \ ++ java/lang/annotation/Inherited.java \ ++ java/lang/annotation/package-info.java \ ++ java/lang/annotation/Retention.java \ ++ java/lang/annotation/RetentionPolicy.java \ ++ java/lang/annotation/Target.java \ ++ java/io/IOError.java \ ++ java/lang/Deprecated.java \ ++ java/lang/Iterable.java \ ++ java/util/RandomAccess.java \ ++ java/lang/CharacterData00.java \ ++ java/lang/CharacterData01.java \ ++ java/lang/CharacterData02.java \ ++ java/lang/CharacterData0E.java \ ++ java/lang/CharacterDataLatin1.java \ ++ java/lang/CharacterDataPrivateUse.java \ ++ java/lang/CharacterDataUndefined.java \ + java/lang/Object.java \ + java/lang/Class.java \ + java/lang/Thread.java \ +@@ -135,13 +209,6 @@ + java/lang/Readable.java \ + java/lang/Override.java \ + java/lang/SuppressWarnings.java \ +- java/lang/ref/Reference.java \ +- java/lang/ref/SoftReference.java \ +- java/lang/ref/WeakReference.java \ +- java/lang/ref/FinalReference.java \ +- java/lang/ref/PhantomReference.java \ +- java/lang/ref/ReferenceQueue.java \ +- java/lang/ref/Finalizer.java \ + java/util/BitSet.java \ + java/util/Calendar.java \ + java/util/GregorianCalendar.java \ +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -62,7 +62,6 @@ + com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \ + com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \ + com/sun/corba/se/impl/encoding/TypeCodeReader.java \ +- com/sun/corba/se/impl/encoding/WrapperInputStream.java +- +- +- ++ com/sun/corba/se/impl/encoding/WrapperInputStream.java \ ++ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ ++ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -29,5 +29,6 @@ + com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ + com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ + com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ ++ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ + com/sun/corba/se/spi/presentation/rmi/StubAdapter.java + +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -81,5 +81,5 @@ + com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \ + com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \ + com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \ +- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java +- ++ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \ ++ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -30,6 +30,7 @@ + com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \ + com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \ + com/sun/corba/se/spi/monitoring/MonitoringFactories.java \ ++ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ + com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \ + com/sun/corba/se/spi/monitoring/MonitoredObject.java \ + com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -66,4 +66,5 @@ + com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ + com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ + com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ +- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java ++ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \ ++ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -81,4 +81,5 @@ + com/sun/corba/se/impl/orbutil/graph/Node.java \ + com/sun/corba/se/impl/orbutil/graph/NodeData.java \ + com/sun/corba/se/impl/orbutil/graph/Graph.java \ +- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java ++ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \ ++ com/sun/corba/se/impl/orbutil/GetPropertyAction.java diff -r 408be9d00bfe -r 2855ab5fe0e7 patches/icedtea-tools.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-tools.patch Sun May 17 22:34:16 2009 +0200 @@ -0,0 +1,83 @@ +diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.linux openjdk/jdk/make/tools/sharing/classlist.linux +--- openjdk-ecj/jdk/make/tools/sharing/classlist.linux 2007-08-30 03:19:44.000000000 -0400 ++++ openjdk/jdk/make/tools/sharing/classlist.linux 2007-09-04 13:33:52.000000000 -0400 +@@ -330,7 +330,6 @@ + java/beans/PropertyChangeEvent + java/util/EventObject + java/awt/Component$AWTTreeLock +-sun/awt/DebugHelper + sun/awt/NativeLibLoader + sun/security/action/LoadLibraryAction + java/awt/GraphicsEnvironment +@@ -341,7 +340,6 @@ + java/lang/ProcessEnvironment$Value + java/lang/ProcessEnvironment$StringEnvironment + java/util/Collections$UnmodifiableMap +-sun/awt/DebugHelperStub + java/awt/Toolkit + java/awt/Toolkit$3 + sun/util/CoreResourceBundleControl +diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.solaris openjdk/jdk/make/tools/sharing/classlist.solaris +--- openjdk-ecj/jdk/make/tools/sharing/classlist.solaris 2007-08-30 03:19:44.000000000 -0400 ++++ openjdk/jdk/make/tools/sharing/classlist.solaris 2007-09-04 13:34:17.000000000 -0400 +@@ -332,7 +332,6 @@ + java/beans/PropertyChangeEvent + java/util/EventObject + java/awt/Component$AWTTreeLock +-sun/awt/DebugHelper + sun/awt/NativeLibLoader + sun/security/action/LoadLibraryAction + java/awt/GraphicsEnvironment +@@ -343,7 +342,6 @@ + java/lang/ProcessEnvironment$Value + java/lang/ProcessEnvironment$StringEnvironment + java/util/Collections$UnmodifiableMap +-sun/awt/DebugHelperStub + java/awt/Toolkit + java/awt/Toolkit$3 + sun/util/CoreResourceBundleControl +diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.windows openjdk/jdk/make/tools/sharing/classlist.windows +--- openjdk-ecj/jdk/make/tools/sharing/classlist.windows 2007-08-30 03:19:44.000000000 -0400 ++++ openjdk/jdk/make/tools/sharing/classlist.windows 2007-09-04 13:34:05.000000000 -0400 +@@ -333,10 +333,8 @@ + java/beans/PropertyChangeEvent + java/util/EventObject + java/awt/Component$AWTTreeLock +-sun/awt/DebugHelper + sun/awt/NativeLibLoader + sun/security/action/LoadLibraryAction +-sun/awt/DebugHelperStub + java/awt/Toolkit + java/awt/Toolkit$3 + sun/util/CoreResourceBundleControl +--- openjdk.orig/jdk/make/java/awt/Makefile 2008-02-28 04:39:42.000000000 -0500 ++++ openjdk/jdk/make/java/awt/Makefile 2008-02-29 14:58:50.000000000 -0500 +@@ -34,7 +34,7 @@ + # + AUTO_FILES_JAVA_DIRS = java/awt sun/awt/geom + +-build: properties cursors ++build: sources properties cursors + + # + # Resources +@@ -47,9 +47,11 @@ + # + include $(BUILDDIR)/common/Classes.gmk + ++sources: + + clean:: properties.clean sun.geom.clean cursors.clean + ++ + _LIBPROPS = \ + flavormap.properties + +@@ -102,6 +104,6 @@ + cursors.clean : + $(RM) -r $(CURSORDIR) + +-.PHONY: properties properties.clean \ ++.PHONY: sources properties properties.clean \ + cursors sun.geom.clean cursors.clean + From mark at klomp.org Mon May 18 00:39:19 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 18 May 2009 07:39:19 +0000 Subject: changeset in /hg/icedtea6: Import Gervill fixes from CVS. See CH... Message-ID: changeset 8259687f8f78 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8259687f8f78 description: Import Gervill fixes from CVS. See CHANGES.txt: 6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz. 6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge. 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 - Fix: Notes get stuck on when we overflow the synthesizer with rapid note on /off messages. JTreg test has been created: test/com/sun/media/sound/SoftChannel/NoteOverFlowTest - Fix: Portamento controller reset to wrong value in SoftChannel.resetAllControllers. This caused incorrect glider effect in some midi files. For example in TuningApplet1 in TET-7 keyboard, when note was pressed for first time a glider effect could be heard. - Fix: Delay modulation calculation in SoftChorus.LFODelay where incorrect. - Fix: Removed unnecessary volatile keywords in SoftChorus. diffstat: 23 files changed, 619 insertions(+), 412 deletions(-) ChangeLog | 26 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 13 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 46 +- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java | 30 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java | 32 -- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 10 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java | 4 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java | 42 +- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java | 64 ++-- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java | 158 +++++----- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java | 46 +- overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java | 24 - overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java | 42 +- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java | 64 ++-- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java | 158 +++++----- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java | 46 +- overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java | 55 ++- overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Interpolate.java | 2 overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java | 2 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java | 106 ++++++ overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java | 55 ++- diffs (truncated from 1525 to 500 lines): diff -r 2855ab5fe0e7 -r 8259687f8f78 ChangeLog --- a/ChangeLog Sun May 17 22:34:16 2009 +0200 +++ b/ChangeLog Mon May 18 08:48:55 2009 +0200 @@ -1,3 +1,29 @@ 2009-05-17 Matthias Klose + + * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*, + overlays/openjdk/jdk/test/com/sun/media/sound/*: + Import Gervill fixes from CVS. See CHANGES.txt: + + 6823446: Gervill SoftLowFrequencyOscillator fails when freq is + set to 0 cent or 8.1758 Hz. + 6823445: Gervill SoftChannel/ResetAllControllers jtreg test + fails after portamento fix from last merge. + 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 + + - Fix: Notes get stuck on when we overflow the synthesizer + with rapid note on /off messages. + JTreg test has been created: + test/com/sun/media/sound/SoftChannel/NoteOverFlowTest + - Fix: Portamento controller reset to wrong value in + SoftChannel.resetAllControllers. + This caused incorrect glider effect in some midi files. + For example in TuningApplet1 in TET-7 keyboard, + when note was pressed for first time a glider effect could be + heard. + - Fix: Delay modulation calculation in SoftChorus.LFODelay where + incorrect. + - Fix: Removed unnecessary volatile keywords in SoftChorus. + 2009-05-17 Matthias Klose Revert patch breaking build using gcj: diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Mon May 18 08:48:55 2009 +0200 @@ -1,3 +1,16 @@ +6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz. +6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge. +6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 + + - Fix: Notes get stuck on when we overflow the synthesizer with rapid note on/off messages. + JTreg test has been created: + test/com/sun/media/sound/SoftChannel/NoteOverFlowTest + - Fix: Portamento controller reset to wrong value in SoftChannel.resetAllControllers. + This caused incorrect glider effect in some midi files. + For example in TuningApplet1 in TET-7 keyboard, + when note was pressed for first time a glider effect could be heard. + - Fix: Delay modulation calculation in SoftChorus.LFODelay where incorrect. + - Fix: Removed unnecessary volatile keywords in SoftChorus. - Fix: Throw IllegalArgumentException Exception on invalid soundbank to: SoftSynthesizer.unloadAllInstruments(Soundbank soundbank) diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Mon May 18 08:48:55 2009 +0200 @@ -1,27 +1,27 @@ /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * 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. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ + * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ package com.sun.media.sound; diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Mon May 18 08:48:55 2009 +0200 @@ -93,7 +93,6 @@ public class SoftChannel implements Midi protected double portamento_time = 1; // keyschanges per control buffer time protected int[] portamento_lastnote = new int[128]; protected int portamento_lastnote_ix = 0; - private int portamento_control_note = -1; private boolean portamento = false; private boolean mono = false; private boolean mute = false; @@ -369,12 +368,12 @@ public class SoftChannel implements Midi voice.setSoloMute(solomute); if (releaseTriggered) return; - if (portamento_control_note != -1) { + if (controller[84] != 0) { voice.co_noteon_keynumber[0] - = (tuning.getTuning(portamento_control_note) / 100.0) + = (tuning.getTuning(controller[84]) / 100.0) * (1f / 128f); voice.portamento = true; - portamento_control_note = -1; + controlChange(84, 0); } else if (portamento) { if (mono) { if (portamento_lastnote[0] != -1) { @@ -382,7 +381,7 @@ public class SoftChannel implements Midi = (tuning.getTuning(portamento_lastnote[0]) / 100.0) * (1f / 128f); voice.portamento = true; - portamento_control_note = -1; + controlChange(84, 0); } portamento_lastnote[0] = noteNumber; } else { @@ -449,19 +448,19 @@ public class SoftChannel implements Midi } } - if (portamento_control_note != -1) { + if (controller[84] != 0) { boolean n_found = false; for (int i = 0; i < voices.length; i++) { if (voices[i].on && voices[i].channel == channel && voices[i].active - && voices[i].note == portamento_control_note + && voices[i].note == controller[84] && voices[i].releaseTriggered == false) { voices[i].portamento = true; voices[i].setNote(noteNumber); n_found = true; } } - portamento_control_note = -1; + controlChange(84, 0); if (n_found) return; } @@ -556,6 +555,18 @@ public class SoftChannel implements Midi && voices[i].releaseTriggered == false) { voices[i].noteOff(velocity); } + // We must also check stolen voices + if (voices[i].stealer_channel == this && voices[i].stealer_noteNumber == noteNumber) { + SoftVoice v = voices[i]; + v.stealer_releaseTriggered = false; + v.stealer_channel = null; + v.stealer_performer = null; + v.stealer_voiceID = -1; + v.stealer_noteNumber = 0; + v.stealer_velocity = 0; + v.stealer_extendedConnectionBlocks = null; + v.stealer_channelmixer = null; + } } // Try play back note-off triggered voices, @@ -1141,9 +1152,6 @@ 121 |79H |**Coarse Tuning |0 } } break; - case 84: - portamento_control_note = value; - break; case 98: nrpn_control = (nrpn_control & (127 << 7)) + value; rpn_control = RPN_NULL_VALUE; diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Mon May 18 08:48:55 2009 +0200 @@ -38,11 +38,11 @@ public class SoftChorus implements SoftA private float[] delaybuffer; private int rovepos = 0; - private volatile float gain = 1; - private volatile float rgain = 0; - private volatile float delay = 0; + private float gain = 1; + private float rgain = 0; + private float delay = 0; private float lastdelay = 0; - private volatile float feedback = 0; + private float feedback = 0; public VariableDelay(int maxbuffersize) { delaybuffer = new float[maxbuffersize]; @@ -115,10 +115,8 @@ public class SoftChorus implements SoftA private static class LFODelay { - private volatile double c_cos_delta; - private volatile double c_sin_delta; - private double c_cos = 1; - private double c_sin = 0; + private double phase = 1; + private double phase_step = 0; private double depth = 0; private VariableDelay vdelay; private double samplerate; @@ -139,13 +137,11 @@ public class SoftChorus implements SoftA public void setRate(double rate) { double g = (Math.PI * 2) * (rate / controlrate); - c_cos_delta = Math.cos(g); - c_sin_delta = Math.sin(g); + phase_step = g; } public void setPhase(double phase) { - c_cos = Math.cos(phase); - c_sin = Math.sin(phase); + this.phase = phase; } public void setFeedBack(float feedback) { @@ -161,16 +157,16 @@ public class SoftChorus implements SoftA } public void processMix(float[] in, float[] out, float[] rout) { - c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta; - c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta; - vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2))); + phase += phase_step; + while(phase > (Math.PI * 2)) phase -= (Math.PI * 2); + vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2))); vdelay.processMix(in, out, rout); } public void processReplace(float[] in, float[] out, float[] rout) { - c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta; - c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta; - vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2))); + phase += phase_step; + while(phase > (Math.PI * 2)) phase -= (Math.PI * 2); + vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2))); vdelay.processReplace(in, out, rout); } diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Mon May 18 08:48:55 2009 +0200 @@ -613,4 +613,4 @@ public class SoftFilter { this.last_gain = this.gain; this.last_wet = this.wet; } -} \ No newline at end of file +} diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Mon May 18 08:48:55 2009 +0200 @@ -45,6 +45,13 @@ public class SoftLowFrequencyOscillator private double sin_factor = 0; private static double PI2 = 2.0 * Math.PI; + public SoftLowFrequencyOscillator() { + // If sin_step is 0 then sin_stepfreq must be -INF + for (int i = 0; i < sin_stepfreq.length; i++) { + sin_stepfreq[i] = Double.NEGATIVE_INFINITY; + } + } + public void reset() { for (int i = 0; i < used_count; i++) { out[i][0] = 0; @@ -53,7 +60,8 @@ public class SoftLowFrequencyOscillator freq[i][0] = 0; delay_counter[i] = 0; sin_phase[i] = 0; - sin_stepfreq[i] = 0; + // If sin_step is 0 then sin_stepfreq must be -INF + sin_stepfreq[i] = Double.NEGATIVE_INFINITY; sin_step[i] = 0; } used_count = 0; diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Mon May 18 08:48:55 2009 +0200 @@ -521,7 +521,7 @@ public class SoftMainMixer { cur_registeredMixers = null; } } - + if(!buffers[CHANNEL_MONO].isSilent()) { float[] mono = buffers[CHANNEL_MONO].array(); @@ -572,7 +572,7 @@ public class SoftMainMixer { if (voicestatus[i].active) if (voicestatus[i].channelmixer == null) voicestatus[i].processAudioLogic(buffers); - + if(!buffers[CHANNEL_MONO].isSilent()) { float[] mono = buffers[CHANNEL_MONO].array(); diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Mon May 18 08:48:55 2009 +0200 @@ -803,7 +803,7 @@ public class SoftVoice extends VoiceStat if (rightdry != null) mixAudioStream(rightdry, left, last_out_mixer_left, out_mixer_left); - } else { + } else { if(rightdry == null && last_out_mixer_left == last_out_mixer_right && out_mixer_left == out_mixer_right) @@ -822,7 +822,7 @@ public class SoftVoice extends VoiceStat } } - if (rightdry == null) { + if (rightdry == null) { mixAudioStream(leftdry, eff1, last_out_mixer_effect1, out_mixer_effect1); mixAudioStream(leftdry, eff2, last_out_mixer_effect2, diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java --- a/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java Mon May 18 08:48:55 2009 +0200 @@ -1,10 +1,3 @@ import java.io.File; -import java.io.File; - -import javax.sound.midi.Patch; -import javax.sound.midi.Soundbank; - -import com.sun.media.sound.DLSSoundbankReader; - /* * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,20 +26,27 @@ import com.sun.media.sound.DLSSoundbankR /* @test @summary Test DLSSoundbankReader getSoundbank(File) method */ +import java.io.File; + +import javax.sound.midi.Patch; +import javax.sound.midi.Soundbank; + +import com.sun.media.sound.DLSSoundbankReader; + public class TestGetSoundbankFile { - private static void assertTrue(boolean value) throws Exception - { - if(!value) - throw new RuntimeException("assertTrue fails!"); - } - - public static void main(String[] args) throws Exception { - File file = new File(System.getProperty("test.src", "."), "ding.dls"); - Soundbank dls = new DLSSoundbankReader().getSoundbank(file); - assertTrue(dls.getInstruments().length == 1); - Patch patch = dls.getInstruments()[0].getPatch(); - assertTrue(patch.getProgram() == 0); - assertTrue(patch.getBank() == 0); - } + private static void assertTrue(boolean value) throws Exception + { + if(!value) + throw new RuntimeException("assertTrue fails!"); + } + + public static void main(String[] args) throws Exception { + File file = new File(System.getProperty("test.src", "."), "ding.dls"); + Soundbank dls = new DLSSoundbankReader().getSoundbank(file); + assertTrue(dls.getInstruments().length == 1); + Patch patch = dls.getInstruments()[0].getPatch(); + assertTrue(patch.getProgram() == 0); + assertTrue(patch.getBank() == 0); + } } diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java --- a/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java Mon May 18 08:48:55 2009 +0200 @@ -1,12 +1,3 @@ import java.io.BufferedInputStream; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; - -import javax.sound.midi.Patch; -import javax.sound.midi.Soundbank; - -import com.sun.media.sound.DLSSoundbankReader; - /* * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,29 +26,38 @@ import com.sun.media.sound.DLSSoundbankR /* @test @summary Test DLSSoundbankReader getSoundbank(InputStream) method */ +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; + +import javax.sound.midi.Patch; +import javax.sound.midi.Soundbank; + +import com.sun.media.sound.DLSSoundbankReader; + public class TestGetSoundbankInputStream { - private static void assertTrue(boolean value) throws Exception - { - if(!value) - throw new RuntimeException("assertTrue fails!"); - } - - public static void main(String[] args) throws Exception { - File file = new File(System.getProperty("test.src", "."), "ding.dls"); - FileInputStream fis = new FileInputStream(file); - BufferedInputStream bis = new BufferedInputStream(fis); - try - { - Soundbank dls = new DLSSoundbankReader().getSoundbank(bis); - assertTrue(dls.getInstruments().length == 1); - Patch patch = dls.getInstruments()[0].getPatch(); - assertTrue(patch.getProgram() == 0); - assertTrue(patch.getBank() == 0); - } - finally - { - bis.close(); - } - } + private static void assertTrue(boolean value) throws Exception + { + if(!value) + throw new RuntimeException("assertTrue fails!"); + } + + public static void main(String[] args) throws Exception { + File file = new File(System.getProperty("test.src", "."), "ding.dls"); + FileInputStream fis = new FileInputStream(file); + BufferedInputStream bis = new BufferedInputStream(fis); + try + { + Soundbank dls = new DLSSoundbankReader().getSoundbank(bis); + assertTrue(dls.getInstruments().length == 1); + Patch patch = dls.getInstruments()[0].getPatch(); + assertTrue(patch.getProgram() == 0); + assertTrue(patch.getBank() == 0); + } + finally + { + bis.close(); + } + } } diff -r 2855ab5fe0e7 -r 8259687f8f78 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java --- a/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java Sun May 17 22:34:16 2009 +0200 +++ b/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java Mon May 18 08:48:55 2009 +0200 @@ -1,14 +1,3 @@ import java.io.BufferedInputStream; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; - -import javax.sound.midi.Patch; -import javax.sound.midi.Soundbank; - -import com.sun.media.sound.DLSSoundbankReader; - /* * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,85 +24,96 @@ import com.sun.media.sound.DLSSoundbankR */ From mark at klomp.org Mon May 18 00:40:58 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 18 May 2009 09:40:58 +0200 Subject: Gervill update (Was: Bump HotSpot to new HotSpot Express repository and hs14b15) In-Reply-To: <1242333882.8315.26.camel@hermans.wildebeest.org> References: <17c6771e0905131622k1f90406cgac2e8f86689e7c5f@mail.gmail.com> <4A0BD83E.5030701@ubuntu.com> <1242301508.2762.5.camel@hermans.wildebeest.org> <1242333882.8315.26.camel@hermans.wildebeest.org> Message-ID: <1242632459.20582.33.camel@hermans.wildebeest.org> Hi, On Thu, 2009-05-14 at 22:44 +0200, Mark Wielaard wrote: > It looks like all of gervill finally > got merged in b16, I will go through our overlay and compare to see if > that is why there are 2 failures. And hopefully merge that this weekend. I ended up just pulling in the new fixes from Gervill CVS into our overlay. That seemed safer just before the release than changing the whole build. After the release I'll see about switching completely to the o6 version. 2009-05-17 Mark Wielaard * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*, overlays/openjdk/jdk/test/com/sun/media/sound/*: Import Gervill fixes from CVS. See CHANGES.txt: 6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz. 6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge. 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 - Fix: Notes get stuck on when we overflow the synthesizer with rapid note on /off messages. JTreg test has been created: test/com/sun/media/sound/SoftChannel/NoteOverFlowTest - Fix: Portamento controller reset to wrong value in SoftChannel.resetAllControllers. This caused incorrect glider effect in some midi files. For example in TuningApplet1 in TET-7 keyboard, when note was pressed for first time a glider effect could be heard. - Fix: Delay modulation calculation in SoftChorus.LFODelay where incorrect. - Fix: Removed unnecessary volatile keywords in SoftChorus. The patch looks bigger than it really is, most of it is whitespace changes, import cleanups and test updates. The actual changes to the code are attached. This makes all sound tests pass, so I would like to see this commit pulled into the new release if possible. Thanks, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: gervill-cvs-update.diff Type: text/x-patch Size: 7931 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090518/989a17e0/gervill-cvs-update.diff From robertschuster at fsfe.org Mon May 18 06:19:16 2009 From: robertschuster at fsfe.org (Robert Schuster) Date: Mon, 18 May 2009 13:19:16 +0000 Subject: changeset in /hg/icedtea6: Fixes PR #310. Message-ID: changeset 4829edfaa376 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4829edfaa376 description: Fixes PR #310. 2009-05-08 Robert Schuster * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj and icedtea build. * configure.ac: New --enable-experimental-openjdk-cross-compilation option. * patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch file (SCA is in place for Robert Schuster). diffstat: 4 files changed, 139 insertions(+) ChangeLog | 9 Makefile.am | 11 + configure.ac | 9 patches/icedtea-disable-cc-incompatible-sanity-checks.patch | 110 +++++++++++ diffs (184 lines): diff -r acaa4872ca75 -r 4829edfaa376 ChangeLog --- a/ChangeLog Fri May 08 14:21:44 2009 +0200 +++ b/ChangeLog Fri May 08 15:56:01 2009 +0200 @@ -1,3 +1,12 @@ 2009-05-08 Robert Schuster + + * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj + and icedtea build. + * configure.ac: New --enable-experimental-openjdk-cross-compilation + option. + * patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch + file (SCA is in place for Robert Schuster). + 2009-05-08 Robert Schuster * configure.ac: Use --cxxflags instead of --cflags for llvm-config. diff -r acaa4872ca75 -r 4829edfaa376 Makefile.am --- a/Makefile.am Fri May 08 14:21:44 2009 +0200 +++ b/Makefile.am Fri May 08 15:56:01 2009 +0200 @@ -184,6 +184,11 @@ if !ENABLE_DOCS if !ENABLE_DOCS ICEDTEA_ENV += \ NO_DOCS="true" +endif + +if ENABLE_CROSS_COMPILATION +ICEDTEA_ENV += \ + "CROSS_COMPILATION=true" endif if USE_ALT_JAR @@ -261,6 +266,11 @@ if !ENABLE_DOCS if !ENABLE_DOCS ICEDTEA_ENV_ECJ += \ NO_DOCS="true" +endif + +if ENABLE_CROSS_COMPILATION +ICEDTEA_ENV_ECJ += \ + "CROSS_COMPILATION=true" endif env-ecj: @@ -652,6 +662,7 @@ ICEDTEA_PATCHES += \ patches/icedtea-java2d-mitre-join.patch \ patches/icedtea-java2d-stroker-internal-joint.patch \ patches/icedtea-java2d-stroker-internal-close-joint.patch \ + patches/icedtea-disable-cc-incompatible-sanity-checks.patch \ $(DISTRIBUTION_PATCHES) stamps/extract.stamp: stamps/download.stamp diff -r acaa4872ca75 -r 4829edfaa376 configure.ac --- a/configure.ac Fri May 08 14:21:44 2009 +0200 +++ b/configure.ac Fri May 08 15:56:01 2009 +0200 @@ -150,6 +150,15 @@ AC_ARG_ENABLE([docs], [ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='yes']) AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes]) AC_MSG_RESULT(${ENABLE_DOCS}) + +# OpenJDK cross-compilation support which is not yet complete +AC_MSG_CHECKING(whether to enable experimental OpenJDK cross-compilation support) +AC_ARG_ENABLE([experimental-openjdk-cross-compilation], + [AS_HELP_STRING([--enable-experimental-openjdk-cross-compilation], + [Enable experimental OpenJDK cross-compilation support])], + [ENABLE_CROSS_COMPILATION="${enableval}"], [ENABLE_CROSS_COMPILATION="${cross_compiling}"]) +AM_CONDITIONAL([ENABLE_CROSS_COMPILATION], [test x$ENABLE_CROSS_COMPILATION = xyes]) +AC_MSG_RESULT(${ENABLE_CROSS_COMPILATION}) AC_MSG_CHECKING(whether to include the XRender pipeline) AC_ARG_ENABLE([xrender], diff -r acaa4872ca75 -r 4829edfaa376 patches/icedtea-disable-cc-incompatible-sanity-checks.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-disable-cc-incompatible-sanity-checks.patch Fri May 08 15:56:01 2009 +0200 @@ -0,0 +1,110 @@ +Index: openjdk/jdk/make/common/shared/Sanity.gmk +=================================================================== +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2009-03-28 18:14:30.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Sanity.gmk 2009-03-28 18:20:33.000000000 +0100 +@@ -75,9 +75,14 @@ + fi ) + endif + ifneq ($(ARCH), ia64) +- # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck) +- ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck +- ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi` ++ ifdef CROSS_COMPILATION ++ # assume alsa version is correct and do not check it ++ ALSA_VERSION = 1.0.0 ++ else ++ # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck) ++ ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck ++ ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi` ++ endif + endif + endif + +@@ -124,6 +129,15 @@ + # Get ALL_SETTINGS defined + include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk + ++ifndef CROSS_COMPILATION ++MORE_PHONY_RULES = \ ++ sane-freetype \ ++ sane-cups \ ++ sane-motif \ ++ sane-alsa-versioncheck \ ++ sane-alsa-headers ++endif ++ + .PHONY: \ + sane-copyrightyear\ + sane-settings \ +@@ -153,8 +167,6 @@ + sane-outputdir \ + sane-alt_bootdir \ + sane-bootdir \ +- sane-motif \ +- sane-cups \ + sane-devtools_path \ + sane-compiler_path \ + sane-unixcommand_path \ +@@ -172,14 +184,14 @@ + sane-compiler \ + sane-link \ + sane-cacerts \ +- sane-alsa-versioncheck \ +- sane-alsa-headers \ + sane-ant_version \ + sane-findbugs_version \ + sane-zip_version \ + sane-unzip_version \ +- sane-msvcrt_path \ +- sane-freetype ++ sane-msvcrt_path \ ++ $(MORE_PHONY_RULES) ++ ++ + + ###################################################### + # check for COPYRIGHT_YEAR variable +Index: openjdk/jdk/make/common/Sanity.gmk +=================================================================== +--- openjdk.orig/jdk/make/common/Sanity.gmk 2009-03-28 18:14:30.000000000 +0100 ++++ openjdk/jdk/make/common/Sanity.gmk 2009-03-28 18:17:44.000000000 +0100 +@@ -93,8 +93,11 @@ + sane-ld_options \ + sane-ld_run_path \ + sane-alt_bootdir \ +- sane-bootdir \ +- sane-alsa-headers ++ sane-bootdir ++ ++ifndef CROSS_COMPILATION ++sanity-all:: sane-alsa-headers ++endif + + ifdef OPENJDK + sanity-all:: sane-freetype +@@ -110,17 +113,21 @@ + # (Which only happens with a full control build. The control makefiles are + # the files that set BUILD_MOTIF). + # We cannot sanity check something that has not been built yet. +-ifeq ($(PLATFORM), linux) +- ifneq ($(BUILD_MOTIF), true) ++ifndef CROSS_COMPILATION ++ ifeq ($(PLATFORM), linux) ++ ifneq ($(BUILD_MOTIF), true) + sanity-all:: \ +- sane-motif ++ sane-motif ++ endif + endif + endif + + # Always check cups header paths on solaris & linux +-ifneq ($(PLATFORM), windows) ++ifndef CROSS_COMPILATION ++ ifneq ($(PLATFORM), windows) + sanity-all:: \ + sane-cups ++ endif + endif + + # Always check hotspot binary paths even if we are building them from scratch From robertschuster at fsfe.org Mon May 18 06:19:17 2009 From: robertschuster at fsfe.org (Robert Schuster) Date: Mon, 18 May 2009 13:19:17 +0000 Subject: changeset in /hg/icedtea6: 2009-05-17 Robert Schuster changeset b7d03f4db639 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b7d03f4db639 description: 2009-05-17 Robert Schuster * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj and icedtea build. * configure.ac: New --enable-openjdk-cross-compilation option. * patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch file (SCA is in place for Robert Schuster). diffstat: 4 files changed, 139 insertions(+) ChangeLog | 9 Makefile.am | 11 + configure.ac | 9 patches/icedtea-disable-cc-incompatible-sanity-checks.patch | 110 +++++++++++ diffs (184 lines): diff -r 8259687f8f78 -r b7d03f4db639 ChangeLog --- a/ChangeLog Mon May 18 08:48:55 2009 +0200 +++ b/ChangeLog Mon May 18 15:17:37 2009 +0200 @@ -1,3 +1,12 @@ 2009-05-17 Mark Wielaard + + * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj + and icedtea build. + * configure.ac: New --enable-openjdk-cross-compilation + option. + * patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch + file (SCA is in place for Robert Schuster). + 2009-05-17 Mark Wielaard * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*, diff -r 8259687f8f78 -r b7d03f4db639 Makefile.am --- a/Makefile.am Mon May 18 08:48:55 2009 +0200 +++ b/Makefile.am Mon May 18 15:17:37 2009 +0200 @@ -197,6 +197,11 @@ if !ENABLE_DOCS if !ENABLE_DOCS ICEDTEA_ENV += \ NO_DOCS="true" +endif + +if ENABLE_CROSS_COMPILATION +ICEDTEA_ENV += \ + "CROSS_COMPILATION=true" endif if USE_ALT_JAR @@ -274,6 +279,11 @@ if !ENABLE_DOCS if !ENABLE_DOCS ICEDTEA_ENV_ECJ += \ NO_DOCS="true" +endif + +if ENABLE_CROSS_COMPILATION +ICEDTEA_ENV_ECJ += \ + "CROSS_COMPILATION=true" endif env-ecj: @@ -650,6 +660,7 @@ ICEDTEA_PATCHES += \ patches/icedtea-java2d-mitre-join.patch \ patches/icedtea-java2d-stroker-internal-joint.patch \ patches/icedtea-java2d-stroker-internal-close-joint.patch \ + patches/icedtea-disable-cc-incompatible-sanity-checks.patch \ $(DISTRIBUTION_PATCHES) stamps/extract.stamp: stamps/download.stamp diff -r 8259687f8f78 -r b7d03f4db639 configure.ac --- a/configure.ac Mon May 18 08:48:55 2009 +0200 +++ b/configure.ac Mon May 18 15:17:37 2009 +0200 @@ -158,6 +158,15 @@ AC_ARG_ENABLE([docs], [ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='yes']) AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes]) AC_MSG_RESULT(${ENABLE_DOCS}) + +# OpenJDK experimental cross-compilation support which is not yet complete +AC_MSG_CHECKING(whether to enable experimental OpenJDK cross-compilation support) +AC_ARG_ENABLE([openjdk-cross-compilation], + [AS_HELP_STRING([--enable-openjdk-cross-compilation], + [Enable experimental OpenJDK cross-compilation support])], + [ENABLE_CROSS_COMPILATION="${enableval}"], [ENABLE_CROSS_COMPILATION="${cross_compiling}"]) +AM_CONDITIONAL([ENABLE_CROSS_COMPILATION], [test x$ENABLE_CROSS_COMPILATION = xyes]) +AC_MSG_RESULT(${ENABLE_CROSS_COMPILATION}) AC_MSG_CHECKING(whether to include the XRender pipeline) AC_ARG_ENABLE([xrender], diff -r 8259687f8f78 -r b7d03f4db639 patches/icedtea-disable-cc-incompatible-sanity-checks.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-disable-cc-incompatible-sanity-checks.patch Mon May 18 15:17:37 2009 +0200 @@ -0,0 +1,110 @@ +Index: openjdk/jdk/make/common/shared/Sanity.gmk +=================================================================== +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2009-03-28 18:14:30.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Sanity.gmk 2009-03-28 18:20:33.000000000 +0100 +@@ -75,9 +75,14 @@ + fi ) + endif + ifneq ($(ARCH), ia64) +- # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck) +- ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck +- ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi` ++ ifdef CROSS_COMPILATION ++ # assume alsa version is correct and do not check it ++ ALSA_VERSION = 1.0.0 ++ else ++ # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck) ++ ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck ++ ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi` ++ endif + endif + endif + +@@ -124,6 +129,15 @@ + # Get ALL_SETTINGS defined + include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk + ++ifndef CROSS_COMPILATION ++MORE_PHONY_RULES = \ ++ sane-freetype \ ++ sane-cups \ ++ sane-motif \ ++ sane-alsa-versioncheck \ ++ sane-alsa-headers ++endif ++ + .PHONY: \ + sane-copyrightyear\ + sane-settings \ +@@ -153,8 +167,6 @@ + sane-outputdir \ + sane-alt_bootdir \ + sane-bootdir \ +- sane-motif \ +- sane-cups \ + sane-devtools_path \ + sane-compiler_path \ + sane-unixcommand_path \ +@@ -172,14 +184,14 @@ + sane-compiler \ + sane-link \ + sane-cacerts \ +- sane-alsa-versioncheck \ +- sane-alsa-headers \ + sane-ant_version \ + sane-findbugs_version \ + sane-zip_version \ + sane-unzip_version \ +- sane-msvcrt_path \ +- sane-freetype ++ sane-msvcrt_path \ ++ $(MORE_PHONY_RULES) ++ ++ + + ###################################################### + # check for COPYRIGHT_YEAR variable +Index: openjdk/jdk/make/common/Sanity.gmk +=================================================================== +--- openjdk.orig/jdk/make/common/Sanity.gmk 2009-03-28 18:14:30.000000000 +0100 ++++ openjdk/jdk/make/common/Sanity.gmk 2009-03-28 18:17:44.000000000 +0100 +@@ -93,8 +93,11 @@ + sane-ld_options \ + sane-ld_run_path \ + sane-alt_bootdir \ +- sane-bootdir \ +- sane-alsa-headers ++ sane-bootdir ++ ++ifndef CROSS_COMPILATION ++sanity-all:: sane-alsa-headers ++endif + + ifdef OPENJDK + sanity-all:: sane-freetype +@@ -110,17 +113,21 @@ + # (Which only happens with a full control build. The control makefiles are + # the files that set BUILD_MOTIF). + # We cannot sanity check something that has not been built yet. +-ifeq ($(PLATFORM), linux) +- ifneq ($(BUILD_MOTIF), true) ++ifndef CROSS_COMPILATION ++ ifeq ($(PLATFORM), linux) ++ ifneq ($(BUILD_MOTIF), true) + sanity-all:: \ +- sane-motif ++ sane-motif ++ endif + endif + endif + + # Always check cups header paths on solaris & linux +-ifneq ($(PLATFORM), windows) ++ifndef CROSS_COMPILATION ++ ifneq ($(PLATFORM), windows) + sanity-all:: \ + sane-cups ++ endif + endif + + # Always check hotspot binary paths even if we are building them from scratch From bugzilla-daemon at icedtea.classpath.org Mon May 18 06:21:58 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 May 2009 13:21:58 +0000 Subject: [Bug 310] icedtea6: icedtea patch to disable sanity checks Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=310 thebohemian at gmx.net changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #14 from thebohemian at gmx.net 2009-05-18 13:21 ------- The option has been added. -- 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 Mon May 18 06:51:20 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Mon, 18 May 2009 15:51:20 +0200 Subject: RFC: xulrunner compilation check not optional Message-ID: <4A1167D8.4020601@gmx.net> Hi, current tip does not build if you disable plugin and npplugin since a check for the mozilla headers is compiled anyways. The attached patch (preliminary, needs better formatting) makes the check dependend on whether any of the plugins is enabled. I am also not 100% sure if it is right. Maybe xulrunner is also needed for other stuff. I talked to Mark on IRC about this and was asked to post the patch here. Regards Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: optional-xulrunner-check.patch Type: text/x-patch Size: 552 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090518/3ffbbcc6/optional-xulrunner-check.patch -------------- 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/20090518/3ffbbcc6/signature.asc From mark at klomp.org Mon May 18 07:17:32 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 18 May 2009 16:17:32 +0200 Subject: Patch to remove GCJ Web Plugin support In-Reply-To: <20090505211034.GA23367@redhat.com> References: <20090505211034.GA23367@redhat.com> Message-ID: <1242656253.20582.100.camel@hermans.wildebeest.org> Hi Deepak, On Tue, 2009-05-05 at 17:10 -0400, Deepak Bhole wrote: > Per the goals for 1.5, here is a patch that removes gcj web plugin > support. > > ChangeLog: > 2009-05-05 Deepak Bhole > > * Makefile.am: Remove GCJ Web Plugin support. > * configure.ac: Ditto. I got slightly confused by this part of the change: -AC_MSG_CHECKING([whether to build the LiveConnect plugin]) -AC_ARG_ENABLE([liveconnect], - [AS_HELP_STRING([--disable-liveconnect], +AC_MSG_CHECKING([whether to build the browser plugin]) +AC_ARG_ENABLE([plugin], + [AS_HELP_STRING([--disable-plugin], That renames the configure option from --enable-liveconnect to --enable-plugin. If it was intentional to change the naming then please do mention it in the the README and NEWS files (which both only mention the --enable-liveconnect flag). Thanks, Mark From bugzilla-daemon at icedtea.classpath.org Mon May 18 07:17:51 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 May 2009 14:17:51 +0000 Subject: [Bug 334] New: allow specifying explicit target arch Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=334 Summary: allow specifying explicit target arch Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: thebohemian at gmx.net Currently the OpenJDK build has no notion of a target arch. Instead the OpenJDK makefile run 'uname -m' and are happy with the result. In a cross-compilation context you cannot do that. As such I extended the makefile in a way that the target architecture can be given through a Makefile variable. Additionally I extended IcedTea's makefiles to provide this value. -- 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 Mon May 18 07:19:40 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 May 2009 14:19:40 +0000 Subject: [Bug 334] allow specifying explicit target arch Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=334 ------- Comment #1 from thebohemian at gmx.net 2009-05-18 14:19 ------- Created an attachment (id=212) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=212&action=view) allow specifying target arch Here is the patch for IcedTea's makefile. It declares a new variable 'TARGET_ARCH' and provides it to OpenJDK's makefiles. -- 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 Mon May 18 07:22:16 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 May 2009 14:22:16 +0000 Subject: [Bug 334] allow specifying explicit target arch Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=334 ------- Comment #2 from thebohemian at gmx.net 2009-05-18 14:22 ------- Created an attachment (id=213) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=213&action=view) icedtea patch to replace 'uname -m' calls This is the patch that changes the behavior of OpenJDK's makefiles. Instead of relying on the output of 'uname -m' the build expects TARGET_ARCH to be set. This feature builds on top of the previously introduced cross-compilation capabilites. As such it has no effect on non-cross builds. -- 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 Mon May 18 07:25:33 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Mon, 18 May 2009 16:25:33 +0200 Subject: RFC: next cross-compilation patch: override 'uname -m' Message-ID: <4A116FDD.3090601@gmx.net> Hi, thanks all for helping me getting the first cross-compilation patch in. Now comes the second one. I described its purpose here: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=334 I hope to hear from you soon. Would be cool if we can get get IcedTea 100% cross-compile ready in the 1.6 timeframe. :) 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/20090518/6426b9f9/signature.asc From thebohemian at gmx.net Mon May 18 07:26:31 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Mon, 18 May 2009 16:26:31 +0200 Subject: RFC: add --enable-experimental-openjdk-cross-compilation option In-Reply-To: <4A043DE5.2070005@gmx.net> References: <4A042EDC.40801@gmx.net> <20090508132053.GF3190@redhat.com> <4A043DE5.2070005@gmx.net> Message-ID: <4A117017.7000200@gmx.net> Hi, Robert Schuster schrieb: > Hi, > > Gary Benson schrieb: >> Have you tested this to make sure it still works for normal builds? >> If so then I'm ok for you to commit this. > just did a test build on my amd64 machine and it caused no change to > this build. > As such I committed the patch. Committed but forgot to push it ... :( The attached patch is what I committed AND pushed just now. ChangeLog: 2009-05-17 Robert Schuster * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj and icedtea build. * configure.ac: New --enable-openjdk-cross-compilation option. * patches/icedtea-disable-cc-incompatible-sanity-checks.patch: New patch file (SCA is in place for Robert Schuster). Regards Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: openjdk-cross-compilation-option.patch Type: text/x-patch Size: 5259 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090518/c4724c9b/openjdk-cross-compilation-option.patch -------------- 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/20090518/c4724c9b/signature.asc From gnu_andrew at member.fsf.org Mon May 18 10:36:12 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 18 May 2009 18:36:12 +0100 Subject: HotSpot 14 In-Reply-To: <4A0ED7FC.9060007@sun.com> References: <17c6771e0905151101g7413db57lcbcba7640af658c@mail.gmail.com> <4A0DB273.9060908@sun.com> <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> <4A0DB792.4020701@sun.com> <4A0E47DD.6000804@sun.com> <4A0ED7FC.9060007@sun.com> Message-ID: <17c6771e0905181036v58e2477ctd26a7d0b6fa2ff5b@mail.gmail.com> > snip... > Given how well this model works for IcedTea working with OpenJDK, I'm > confident it can also work for the JDK's incorporation of corba, jaxp, and > jaxws :-) > Indeed, IcedTea already downloads a tarball of the HSX repository and deletes the OpenJDK6 version. Having to sync between HSX and OpenJDK6 just seems to create unnecessary work. The big question is what would be in the build drops -- would these be a complete amalgamation of all the tarballs from their various sources or just upstream OpenJDK6 (i.e. jdk and langtools by the sound of it)? > -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 bugzilla-daemon at icedtea.classpath.org Mon May 18 10:53:29 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 May 2009 17:53:29 +0000 Subject: [Bug 333] JVM crashes when try load LibGlade file Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=333 ------- Comment #1 from aph at redhat.com 2009-05-18 17:53 ------- We don't really have enough information here. Can you let us know exactly which version of libglad you used, what you did, etc? A complete test case is really what we need. -- 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 Mon May 18 11:00:12 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 18 May 2009 19:00:12 +0100 Subject: Recruiting People to FOSS Java Projects Message-ID: <17c6771e0905181100k6f70ab4q701b9a716d08fd2@mail.gmail.com> Next FOSDEM recording now available: http://www.archive.org/details/fosdem_2009_free_java_recruitment http://gnuandrew.blip.tv/file/2114762/ You can find the full list with links to slides at http://fuseyism.com#movies -- 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 Mon May 18 14:53:44 2009 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Mon, 18 May 2009 14:53:44 -0700 Subject: HotSpot 14 In-Reply-To: <17c6771e0905181036v58e2477ctd26a7d0b6fa2ff5b@mail.gmail.com> References: <17c6771e0905151101g7413db57lcbcba7640af658c@mail.gmail.com> <4A0DB273.9060908@sun.com> <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> <4A0DB792.4020701@sun.com> <4A0E47DD.6000804@sun.com> <4A0ED7FC.9060007@sun.com> <17c6771e0905181036v58e2477ctd26a7d0b6fa2ff5b@mail.gmail.com> Message-ID: <4A11D8E8.70004@sun.com> Andrew John Hughes wrote: >> snip... >> Given how well this model works for IcedTea working with OpenJDK, I'm >> confident it can also work for the JDK's incorporation of corba, jaxp, and >> jaxws :-) >> >> > > Indeed, IcedTea already downloads a tarball of the HSX repository and > deletes the OpenJDK6 version. Having to sync between HSX and OpenJDK6 > just seems to create unnecessary work. > > The big question is what would be in the build drops -- would these be > a complete amalgamation of all the tarballs from their various sources > or just upstream OpenJDK6 (i.e. jdk and langtools by the sound of it)? > That is a detail that remains to be worked out. Would you prefer one big tarball? -Joe From gnu_andrew at member.fsf.org Mon May 18 14:57:42 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 18 May 2009 22:57:42 +0100 Subject: HotSpot 14 In-Reply-To: <4A11D8E8.70004@sun.com> References: <17c6771e0905151101g7413db57lcbcba7640af658c@mail.gmail.com> <4A0DB273.9060908@sun.com> <17c6771e0905151129r46a63069tab22c6b39901a6ec@mail.gmail.com> <4A0DB792.4020701@sun.com> <4A0E47DD.6000804@sun.com> <4A0ED7FC.9060007@sun.com> <17c6771e0905181036v58e2477ctd26a7d0b6fa2ff5b@mail.gmail.com> <4A11D8E8.70004@sun.com> Message-ID: <17c6771e0905181457q5229a695j3779d88cd52af12d@mail.gmail.com> 2009/5/18 Joseph D. Darcy : > Andrew John Hughes wrote: >>> >>> snip... >>> Given how well this model works for IcedTea working with OpenJDK, I'm >>> confident it can also work for the JDK's incorporation of corba, jaxp, >>> and >>> jaxws :-) >>> >>> >> >> Indeed, IcedTea already downloads a tarball of the HSX repository and >> deletes the OpenJDK6 version. ?Having to sync between HSX and OpenJDK6 >> just seems to create unnecessary work. >> >> The big question is what would be in the build drops -- would these be >> a complete amalgamation of all the tarballs from their various sources >> or just upstream OpenJDK6 (i.e. jdk and langtools by the sound of it)? >> > > That is a detail that remains to be worked out. ?Would you prefer one big > tarball? > > -Joe > I think it would be easier and we then also know we are using exactly the same sources as Sun, and can compare e.g. test results. -- 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 ahughes at redhat.com Mon May 18 18:31:27 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 19 May 2009 01:31:27 +0000 Subject: changeset in /hg/icedtea: Update generated files and add new one... Message-ID: changeset a2d7e774507e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a2d7e774507e description: Update generated files and add new ones required to build hotspot-tools. 2009-05-14 Andrew John Hughes * Makefile.am: Update list of generated files. * generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java, * generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java, * generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java, * generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java: Update. * generated/sun/awt/X11/XAWTIcon32_security_icon_bw16_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_bw24_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_bw32_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_bw48_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_interim16_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_interim24_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_interim32_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_interim48_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_yellow16_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_yellow24_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_yellow32_png.java, * generated/sun/awt/X11/XAWTIcon32_security_icon_yellow48_png.java: Add new generated files. * generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java, * generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java, * generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java, * generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java: Updated. * generated/sun/awt/X11/XAWTIcon64_security_icon_bw16_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_bw24_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_bw32_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_bw48_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_interim16_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_interim24_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_interim32_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_interim48_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_yellow16_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_yellow24_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_yellow32_png.java, * generated/sun/awt/X11/XAWTIcon64_security_icon_yellow48_png.java, * generated/sun/awt/X11/XkbAccessXNotifyEvent.java, * generated/sun/awt/X11/XkbActionMessageEvent.java, * generated/sun/awt/X11/XkbAnyEvent.java, * generated/sun/awt/X11/XkbBellNotifyEvent.java, * generated/sun/awt/X11/XkbCompatMapNotifyEvent.java, * generated/sun/awt/X11/XkbControlsNotifyEvent.java, * generated/sun/awt/X11/XkbEvent.java, * generated/sun/awt/X11/XkbExtensionDeviceNotifyEvent.java, * generated/sun/awt/X11/XkbIndicatorNotifyEvent.java, * generated/sun/awt/X11/XkbMapNotifyEvent.java, * generated/sun/awt/X11/XkbNamesNotifyEvent.java, * generated/sun/awt/X11/XkbNewKeyboardNotifyEvent.java, * generated/sun/awt/X11/XkbStateNotifyEvent.java: Add new generated files. diffstat: 47 files changed, 4887 insertions(+), 16 deletions(-) ChangeLog | 54 ++ Makefile.am | 37 + generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java | 30 + generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java | 60 ++ generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java | 107 ++++ generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java | 235 +++++++++ generated/sun/awt/X11/XAWTIcon32_security_icon_bw16_png.java | 31 + generated/sun/awt/X11/XAWTIcon32_security_icon_bw24_png.java | 63 ++ generated/sun/awt/X11/XAWTIcon32_security_icon_bw32_png.java | 108 ++++ generated/sun/awt/X11/XAWTIcon32_security_icon_bw48_png.java | 236 ++++++++++ generated/sun/awt/X11/XAWTIcon32_security_icon_interim16_png.java | 31 + generated/sun/awt/X11/XAWTIcon32_security_icon_interim24_png.java | 63 ++ generated/sun/awt/X11/XAWTIcon32_security_icon_interim32_png.java | 108 ++++ generated/sun/awt/X11/XAWTIcon32_security_icon_interim48_png.java | 236 ++++++++++ generated/sun/awt/X11/XAWTIcon32_security_icon_yellow16_png.java | 31 + generated/sun/awt/X11/XAWTIcon32_security_icon_yellow24_png.java | 63 ++ generated/sun/awt/X11/XAWTIcon32_security_icon_yellow32_png.java | 108 ++++ generated/sun/awt/X11/XAWTIcon32_security_icon_yellow48_png.java | 236 ++++++++++ generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java | 30 + generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java | 60 ++ generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java | 107 ++++ generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java | 235 +++++++++ generated/sun/awt/X11/XAWTIcon64_security_icon_bw16_png.java | 31 + generated/sun/awt/X11/XAWTIcon64_security_icon_bw24_png.java | 63 ++ generated/sun/awt/X11/XAWTIcon64_security_icon_bw32_png.java | 108 ++++ generated/sun/awt/X11/XAWTIcon64_security_icon_bw48_png.java | 236 ++++++++++ generated/sun/awt/X11/XAWTIcon64_security_icon_interim16_png.java | 31 + generated/sun/awt/X11/XAWTIcon64_security_icon_interim24_png.java | 63 ++ generated/sun/awt/X11/XAWTIcon64_security_icon_interim32_png.java | 108 ++++ generated/sun/awt/X11/XAWTIcon64_security_icon_interim48_png.java | 236 ++++++++++ generated/sun/awt/X11/XAWTIcon64_security_icon_yellow16_png.java | 31 + generated/sun/awt/X11/XAWTIcon64_security_icon_yellow24_png.java | 63 ++ generated/sun/awt/X11/XAWTIcon64_security_icon_yellow32_png.java | 108 ++++ generated/sun/awt/X11/XAWTIcon64_security_icon_yellow48_png.java | 236 ++++++++++ generated/sun/awt/X11/XkbAccessXNotifyEvent.java | 90 +++ generated/sun/awt/X11/XkbActionMessageEvent.java | 97 ++++ generated/sun/awt/X11/XkbAnyEvent.java | 78 +++ generated/sun/awt/X11/XkbBellNotifyEvent.java | 102 ++++ generated/sun/awt/X11/XkbCompatMapNotifyEvent.java | 90 +++ generated/sun/awt/X11/XkbControlsNotifyEvent.java | 102 ++++ generated/sun/awt/X11/XkbEvent.java | 86 +++ generated/sun/awt/X11/XkbExtensionDeviceNotifyEvent.java | 105 ++++ generated/sun/awt/X11/XkbIndicatorNotifyEvent.java | 84 +++ generated/sun/awt/X11/XkbMapNotifyEvent.java | 135 +++++ generated/sun/awt/X11/XkbNamesNotifyEvent.java | 114 ++++ generated/sun/awt/X11/XkbNewKeyboardNotifyEvent.java | 102 ++++ generated/sun/awt/X11/XkbStateNotifyEvent.java | 135 +++++ diffs (truncated from 5124 to 500 lines): diff -r 9c44278ad34b -r a2d7e774507e ChangeLog --- a/ChangeLog Wed May 13 01:31:07 2009 +0100 +++ b/ChangeLog Thu May 14 10:32:51 2009 +0100 @@ -1,3 +1,57 @@ 2009-05-12 Andrew John Hughes + + * Makefile.am: + Update list of generated files. + * generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java, + * generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java, + * generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java, + * generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java: + Update. + * generated/sun/awt/X11/XAWTIcon32_security_icon_bw16_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_bw24_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_bw32_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_bw48_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_interim16_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_interim24_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_interim32_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_interim48_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_yellow16_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_yellow24_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_yellow32_png.java, + * generated/sun/awt/X11/XAWTIcon32_security_icon_yellow48_png.java: + Add new generated files. + * generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java, + * generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java, + * generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java, + * generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java: + Updated. + * generated/sun/awt/X11/XAWTIcon64_security_icon_bw16_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_bw24_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_bw32_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_bw48_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_interim16_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_interim24_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_interim32_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_interim48_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_yellow16_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_yellow24_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_yellow32_png.java, + * generated/sun/awt/X11/XAWTIcon64_security_icon_yellow48_png.java, + * generated/sun/awt/X11/XkbAccessXNotifyEvent.java, + * generated/sun/awt/X11/XkbActionMessageEvent.java, + * generated/sun/awt/X11/XkbAnyEvent.java, + * generated/sun/awt/X11/XkbBellNotifyEvent.java, + * generated/sun/awt/X11/XkbCompatMapNotifyEvent.java, + * generated/sun/awt/X11/XkbControlsNotifyEvent.java, + * generated/sun/awt/X11/XkbEvent.java, + * generated/sun/awt/X11/XkbExtensionDeviceNotifyEvent.java, + * generated/sun/awt/X11/XkbIndicatorNotifyEvent.java, + * generated/sun/awt/X11/XkbMapNotifyEvent.java, + * generated/sun/awt/X11/XkbNamesNotifyEvent.java, + * generated/sun/awt/X11/XkbNewKeyboardNotifyEvent.java, + * generated/sun/awt/X11/XkbStateNotifyEvent.java: + Add new generated files. + 2009-05-12 Andrew John Hughes * patches/icedtea-idl.patch, diff -r 9c44278ad34b -r a2d7e774507e Makefile.am --- a/Makefile.am Wed May 13 01:31:07 2009 +0100 +++ b/Makefile.am Thu May 14 10:32:51 2009 +0100 @@ -832,6 +832,43 @@ GENERATED_FILES = generated/com/sun/java generated/sun/awt/X11/XIMStatusDrawCallbackStruct.java \ generated/sun/awt/X11/XWMHints.java \ generated/sun/awt/X11/XCirculateEvent.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_bw16_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_bw24_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_bw32_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_bw48_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_interim16_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_interim24_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_interim32_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_interim48_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_yellow16_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_yellow24_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_yellow32_png.java \ + generated/sun/awt/X11/XAWTIcon32_security_icon_yellow48_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_bw16_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_bw24_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_bw32_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_bw48_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_interim16_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_interim24_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_interim32_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_interim48_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_yellow16_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_yellow24_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_yellow32_png.java \ + generated/sun/awt/X11/XAWTIcon64_security_icon_yellow48_png.java \ + generated/sun/awt/X11/XkbAccessXNotifyEvent.java \ + generated/sun/awt/X11/XkbActionMessageEvent.java \ + generated/sun/awt/X11/XkbAnyEvent.java \ + generated/sun/awt/X11/XkbBellNotifyEvent.java \ + generated/sun/awt/X11/XkbCompatMapNotifyEvent.java \ + generated/sun/awt/X11/XkbControlsNotifyEvent.java \ + generated/sun/awt/X11/XkbEvent.java \ + generated/sun/awt/X11/XkbExtensionDeviceNotifyEvent.java \ + generated/sun/awt/X11/XkbIndicatorNotifyEvent.java \ + generated/sun/awt/X11/XkbMapNotifyEvent.java \ + generated/sun/awt/X11/XkbNamesNotifyEvent.java \ + generated/sun/awt/X11/XkbNewKeyboardNotifyEvent.java \ + generated/sun/awt/X11/XkbStateNotifyEvent.java \ generated/sun/awt/resources/awt_sv.java \ generated/sun/awt/resources/awt_fr.java \ generated/sun/awt/resources/awt.java \ diff -r 9c44278ad34b -r a2d7e774507e generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java --- a/generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java Wed May 13 01:31:07 2009 +0100 +++ b/generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java Thu May 14 10:32:51 2009 +0100 @@ -1,5 +1,31 @@ package sun.awt.X11; package sun.awt.X11; public class XAWTIcon32_java_icon16_png { public static int[] java_icon16_png = { -0,0 -}; } +16,16, +0x689fb5c9, +0xcc9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, +0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xcc9fb5c8, 0x689fb5c9, 0xcc9bb2c4, 0xffd5dade, 0xfff5f5f5, 0xfff7f7f7, 0xfff7f7f7, +0xfff7f7f7, 0xfff7f7f7, 0xff9b9b9b, 0xffbbbbbb, 0xfff4f4f4, 0xfff7f7f7, 0xfff7f7f7, 0xfff7f7f7, 0xfff5f5f5, 0xffd5dade, +0xcc9bb2c4, 0xff96acbf, 0xffededed, 0xfffcfcfc, 0xfffdfdfd, 0xfffdfdfd, 0xfffdfdfd, 0xfffdfdfd, 0xff575757, 0xff454646, +0xffb7a697, 0xfffafafa, 0xfffdfdfd, 0xfffdfdfd, 0xfffcfcfc, 0xffededed, 0xff96acbf, 0xff90a7ba, 0xffececec, 0xfffbfbfb, +0xfffbfbfb, 0xfffbfbfb, 0xfffbfbfb, 0xffededed, 0xff2e3333, 0xff3c3e3e, 0xff42433f, 0xffcfd0d0, 0xfffbfbfb, 0xfffbfbfb, +0xfffbfbfb, 0xffececec, 0xff90a7ba, 0xff89a1b5, 0xffe9e9e9, 0xfff9f9f9, 0xfff9f9f9, 0xfff9f9f9, 0xfff9f9f9, 0xff9e9f9f, +0xff4f2828, 0xffd24747, 0xffab4a4a, 0xff5e564f, 0xfff5f5f5, 0xfff9f9f9, 0xfff9f9f9, 0xffe9e9e9, 0xff89a1b5, 0xff829baf, +0xffe7e7e7, 0xfff6f6f6, 0xfff6f6f6, 0xffeae9e9, 0xffc6c6c6, 0xff413d35, 0xff7c2525, 0xfff84343, 0xfff84040, 0xff634241, +0xffcecfcf, 0xfff4f4f4, 0xffececec, 0xffe7e7e7, 0xff829baf, 0xff7b94a8, 0xffe4e4e4, 0xffebebeb, 0xff999c9f, 0xff627381, +0xff575c60, 0xff959696, 0xff462828, 0xff731515, 0xff7e1919, 0xffe3d2d2, 0xffa4a6a6, 0xffbebebe, 0xff949494, 0xffe4e4e4, +0xff7b94a8, 0xff748da2, 0xffe1e1e1, 0xff878685, 0xff6b839b, 0xffb1d4f2, 0xff929ca6, 0xffacaba9, 0xff3a3b3b, 0xff070101, +0xff4f4848, 0xffffffff, 0xffbbbbbb, 0xff5e5e5e, 0xff797979, 0xffe1e1e1, 0xff748da2, 0xff6c879b, 0xffdedede, 0xff5c5b5b, +0xff413b33, 0xff504b43, 0xff8f867a, 0xffb1b2b3, 0xff7f8080, 0xff686a6a, 0xffced0d0, 0xffffffff, 0xffcbcdcf, 0xff1d1e1f, +0xff444444, 0xffdcdcdc, 0xff6c879b, 0xff648094, 0xffdcdcdc, 0xff828282, 0xff484845, 0xff414e58, 0xff6f7274, 0xffbdbdbd, +0xffc0c0c0, 0xffd5d5d5, 0xffffffff, 0xffffffff, 0xffd9d9d9, 0xff3c4f5e, 0xff56636e, 0xffd8d8d8, 0xff648094, 0xff5d798e, +0xffd9d9d9, 0xffdedede, 0xffd7d7d7, 0xfffafafa, 0xff828282, 0xffaaaaaa, 0xffb7b7b7, 0xffd0d0d0, 0xffececec, 0xfffefefe, +0xffe4e4e4, 0xff526a7d, 0xff899eaf, 0xffd5d5d5, 0xff5d798e, 0xff567287, 0xffd6d6d6, 0xffc6c6c6, 0xffa6a6a6, 0xff8f8f8f, +0xff5b5c5e, 0xff737373, 0xff6a6a6a, 0xff797979, 0xff969696, 0xffd0d0d0, 0xffe1e1e1, 0xff71818e, 0xffe0e0e0, 0xffd4d4d4, +0xff567287, 0xff4f6c81, 0xffdbdbdb, 0xffb4b4b4, 0xff919191, 0xff737373, 0xff414141, 0xff424242, 0xff1a1a1a, 0xff0f0f0f, +0xff252525, 0xff7b7b7b, 0xffa1a1a1, 0xffbababa, 0xffe5e5e5, 0xffdbdbdb, 0xff4f6c81, 0xff48667c, 0xffdfdfdf, 0xffe6e6e6, +0xffabbbc7, 0xff87a0b4, 0xff5f7a8f, 0xff536a7d, 0xff4f6576, 0xff485c6c, 0xff3e4f5d, 0xff384550, 0xff495b6a, 0xffe2e2e2, +0xffe9e9e9, 0xffdfdfdf, 0xff48667c, 0xe1426177, 0xffaab0b5, 0xffe8e8e8, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, +0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffeaeaea, 0xffaab0b5, 0xe1426177, 0x683d5d71, +0xcc3d5d72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, +0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xcc3d5d72, 0x683d5d71, }; } diff -r 9c44278ad34b -r a2d7e774507e generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java --- a/generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java Wed May 13 01:31:07 2009 +0100 +++ b/generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java Thu May 14 10:32:51 2009 +0100 @@ -1,5 +1,61 @@ package sun.awt.X11; package sun.awt.X11; public class XAWTIcon32_java_icon24_png { public static int[] java_icon24_png = { -0,0 -}; } +24,23, +0x1a9dbac4, +0x80a1b5c9, 0xd5a0b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, +0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, +0xd5a0b6c9, 0x80a1b5c9, 0x1a9dbac4, 0x809db3c5, 0xffbec9d2, 0xffe8ebed, 0xfff8f8f8, 0xfffafafa, 0xfffafafa, 0xfffafafa, +0xfffafafa, 0xfffafafa, 0xfffafafa, 0xffe3e3e3, 0xff989898, 0xffdadada, 0xfffafafa, 0xfffafafa, 0xfffafafa, 0xfffafafa, +0xfffafafa, 0xfffafafa, 0xfffafafa, 0xfff8f8f8, 0xffe8ebed, 0xffbec9d2, 0x809db3c5, 0xd59ab0c3, 0xffdce0e3, 0xfff5f4fb, +0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xffd2d1d7, 0xff4c4c4d, 0xff959598, +0xfff3f2f9, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xffdce0e3, +0xd59ab0c3, 0xff96adc0, 0xffededed, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, +0xfff3f3fa, 0xffbbbbc1, 0xff2b2b2b, 0xff4d4d4d, 0xff88888b, 0xffe9e9f0, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, +0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xffededed, 0xff96adc0, 0xff92a9bc, 0xffececec, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, +0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xffeeedf4, 0xff8e8e92, 0xff282626, 0xff414242, 0xff4c4f4f, 0xff807f82, +0xffe6e5ec, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xffececec, 0xff92a9bc, 0xff8ea5b9, +0xffebebeb, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xffe5e4ec, 0xff4c4c4e, +0xff1e2828, 0xff293434, 0xff424c4c, 0xff3d4748, 0xff8a8a8e, 0xffeeedf5, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, +0xfff0eff7, 0xffebebeb, 0xff8ea5b9, 0xff89a1b4, 0xffe9e9e9, 0xffededf5, 0xffededf5, 0xffededf5, 0xffededf5, 0xffededf5, +0xffededf5, 0xffededf5, 0xffafb0b5, 0xff232627, 0xff4b2a2a, 0xffb53e3e, 0xffc34c4c, 0xff704646, 0xff394243, 0xffaeafb5, +0xffededf5, 0xffededf5, 0xffededf5, 0xffededf5, 0xffededf5, 0xffe9e9e9, 0xff89a1b4, 0xff849cb0, 0xffe7e7e7, 0xffebebf3, +0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffe5e5ed, 0xff525558, 0xff342323, 0xffba3232, 0xfffe4e4e, +0xffff5858, 0xffdf4949, 0xff623636, 0xff5e6568, 0xffdedee6, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffe7e7e7, +0xff849cb0, 0xff7f98ac, 0xffe5e5e5, 0xffe8e8f1, 0xffe8e8f1, 0xffe8e8f1, 0xffe1e1e9, 0xffd2d1d9, 0xffcacad2, 0xff97989d, +0xff282c2d, 0xff3d1b1b, 0xffad2828, 0xffea3f3f, 0xfffc4848, 0xfff43c3c, 0xff8c3939, 0xff454e4f, 0xffb5b6bc, 0xffe8e8f1, +0xffe4e4ec, 0xffd9d9e1, 0xffe4e4ed, 0xffe5e5e5, 0xff7f98ac, 0xff7a93a7, 0xffe3e3e3, 0xffe6e6ee, 0xffe1e1e8, 0xffc3c3ca, +0xff7f8286, 0xff525456, 0xff343435, 0xff565656, 0xff8d8f8f, 0xff4e3d3d, 0xff540e0e, 0xff9d2828, 0xffbb2a2a, 0xff9c1313, +0xffa86e6e, 0xffeef3f3, 0xffa0a1a4, 0xffd6d6de, 0xffc7c7ce, 0xff6c6c6f, 0xffc4c4cb, 0xffe3e3e3, 0xff7a93a7, 0xff748ea2, +0xffe2e2e2, 0xffd0d0d8, 0xff89898e, 0xff687b8d, 0xff7ca5c2, 0xff749bb9, 0xff64717d, 0xff8b8b8a, 0xffd4d5d5, 0xff666464, +0xff130000, 0xff410e0e, 0xff480a0a, 0xff400d0d, 0xffb0a3a3, 0xffffffff, 0xffbfbfbf, 0xff848489, 0xffbebec5, 0xff434345, +0xffb1b1b8, 0xffe2e2e2, 0xff748ea2, 0xff6f899d, 0xffe0e0e0, 0xff7a797c, 0xff393f43, 0xff82a6ca, 0xffbae3fc, 0xffbcdffe, +0xff94a3b5, 0xffa2a1a0, 0xffadaeac, 0xff636464, 0xff121313, 0xff050101, 0xff000202, 0xff4f5353, 0xffe4e7e7, 0xffffffff, +0xffe3e3e3, 0xff545455, 0xff828287, 0xff49494b, 0xffa3a3a9, 0xffe0e0e0, 0xff6f899d, 0xff698499, 0xffdddddd, 0xff4c4c4f, +0xff383834, 0xff3f3f40, 0xff787777, 0xffa1958b, 0xff918477, 0xffaba8a6, 0xffacaeaf, 0xff828282, 0xff464747, 0xff2d3030, +0xff4d5050, 0xffc0c2c2, 0xffffffff, 0xffffffff, 0xfffbfbfb, 0xff616162, 0xff19191a, 0xff303030, 0xff808085, 0xffdddddd, +0xff698499, 0xff647f94, 0xffdbdbdb, 0xff46484c, 0xff463f37, 0xff453a29, 0xff0e0b07, 0xff2b261a, 0xff756c5e, 0xffadacaa, +0xffb5b7b7, 0xffa9a9a9, 0xff949494, 0xff929292, 0xffc3c3c3, 0xfffbfbfb, 0xffffffff, 0xffffffff, 0xffffffff, 0xff8f8f93, +0xff313234, 0xff1a1a1a, 0xff7c7d81, 0xffdbdbdb, 0xff647f94, 0xff5e7a8f, 0xffdadada, 0xff76767c, 0xff282623, 0xff474744, +0xff5a5b5f, 0xff6b6c72, 0xff6f7071, 0xffafb0b0, 0xffbbbbbb, 0xffbfbfbf, 0xffc4c4c4, 0xffd1d0d0, 0xffeeeeee, 0xffffffff, +0xffffffff, 0xffffffff, 0xfffbfbfb, 0xff959599, 0xffa2a3aa, 0xff56575a, 0xffabacb4, 0xffdadada, 0xff5e7a8f, 0xff59758a, +0xffd8d8d8, 0xffc1c2cb, 0xff7d7e84, 0xffa5a6ae, 0xffd4d5df, 0xffcdced8, 0xff7c7d80, 0xffaaaaaa, 0xffb5b5b5, 0xffbdbdbd, +0xffc9c9c9, 0xffdadada, 0xffeeeeee, 0xfffdfdfd, 0xffffffff, 0xffffffff, 0xfffdfdfd, 0xff8c8c8e, 0xffc0c1ca, 0xffcdcdd7, +0xffd4d5df, 0xffd8d8d8, 0xff59758a, 0xff547186, 0xffd6d6d6, 0xffd1d3dd, 0xffd1d3dd, 0xffcfd1db, 0xffcfd1da, 0xffb6b7c0, +0xff717173, 0xff979797, 0xff9f9f9f, 0xffa8a8a8, 0xffb4b4b4, 0xffc2c2c2, 0xffd2d2d2, 0xffe3e3e3, 0xfff1f1f1, 0xfffdfdfd, +0xffffffff, 0xff979798, 0xffc1c3cb, 0xffd1d3dd, 0xffd1d3dd, 0xffd6d6d6, 0xff547186, 0xff4f6c82, 0xffd7d7d7, 0xffc0c1cb, +0xffb3b3bd, 0xff9c9da5, 0xff8f9097, 0xff78787f, 0xff606162, 0xff7d7d7d, 0xff6e6e6e, 0xff6e6e6e, 0xff787878, 0xff868686, +0xff929292, 0xffa6a6a6, 0xffc1c1c1, 0xffe1e1e1, 0xfff7f7f7, 0xff9d9d9f, 0xffc6c7d0, 0xffcfd0db, 0xffcfd0db, 0xffd7d7d7, +0xff4f6c82, 0xff4a687d, 0xffd9d9d9, 0xff9d9ea6, 0xff84848c, 0xff69696f, 0xff505155, 0xff3a3a3d, 0xff3f4040, 0xff717171, +0xff535353, 0xff393939, 0xff363637, 0xff3c3c3c, 0xff434343, 0xff575757, 0xff7f7f7f, 0xffbebebe, 0xffebebeb, 0xff919294, +0xffbbbcc6, 0xffcdced9, 0xffcdced9, 0xffd9d9d9, 0xff4a687d, 0xff46647a, 0xffdcdcdc, 0xffa3a4ae, 0xff9b9ca5, 0xff9798a1, +0xff8f9098, 0xff7a7a82, 0xff3e3e42, 0xff363637, 0xff373737, 0xff272728, 0xff333336, 0xff434347, 0xff343537, 0xff1e1e1f, +0xff3c3c3c, 0xff878787, 0xffa7a7a7, 0xff76767b, 0xffb9bac5, 0xffc3c4d0, 0xffc9cad6, 0xffdcdcdc, 0xff46647a, 0xd5426077, +0xffc2c7ca, 0xffc4c6d1, 0xffc5c7d2, 0xffc7c9d4, 0xffc7c9d4, 0xffc3c5d0, 0xffacaeb7, 0xff909199, 0xff8b8c93, 0xff8c8e95, +0xff9799a1, 0xffa2a3ac, 0xff93949c, 0xff67686e, 0xff444548, 0xff454648, 0xff5e5f63, 0xffa5a7af, 0xffc3c5cf, 0xffc3c5cf, +0xffc8cad5, 0xffc2c7ca, 0xd5426077, 0x803e5e74, 0xff778792, 0xffbbc1c4, 0xffe6e6e6, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, +0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, +0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe6e6e6, 0xffbbc1c4, 0xff778792, 0x803e5e74, 0x1a3b586c, 0x803a5a70, 0xd5395a71, +0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, +0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xd5395a71, 0x803a5a70, +0x1a3b586c, }; } diff -r 9c44278ad34b -r a2d7e774507e generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java --- a/generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java Wed May 13 01:31:07 2009 +0100 +++ b/generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java Thu May 14 10:32:51 2009 +0100 @@ -1,5 +1,108 @@ package sun.awt.X11; package sun.awt.X11; public class XAWTIcon32_java_icon32_png { public static int[] java_icon32_png = { -0,0 -}; } +32,32, +0x0, +0x0, 0x409fb7c7, 0x7fa1b7c9, 0xbfa2b6ca, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, +0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, +0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xbfa2b6ca, 0x7fa1b7c9, 0x409fb7c7, 0x0, +0x0, 0x0, 0x409fb3c7, 0xffaebecc, 0xffc0cbd5, 0xffd8dee2, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, +0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, +0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xffd8dee2, 0xffc0cbd5, +0xffaebecc, 0x409fb3c7, 0x0, 0x409bb3c7, 0xffacbdcb, 0xffcfd7dd, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, +0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xffbab9be, 0xffa09fa4, 0xffeae9f0, +0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, +0xfff4f3fa, 0xfff4f3fa, 0xffcfd7dd, 0xffacbdcb, 0x409bb3c7, 0x7f9bb1c5, 0xffbdc8d2, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, +0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xff8e8d91, +0xff373737, 0xff858487, 0xffe6e6ec, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, +0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xffbdc8d2, 0x7f9bb1c5, 0xbf98aec2, 0xffd4d9de, 0xfff2f1f9, +0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, +0xffecebf2, 0xff77777a, 0xff333333, 0xff494949, 0xff757578, 0xffdedde4, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, +0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xffd4d9de, 0xbf98aec2, 0xff95abbf, +0xffececec, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, +0xfff1f0f8, 0xfff1f0f8, 0xffd5d4db, 0xff555557, 0xff2a2a2a, 0xff444444, 0xff4c4c4c, 0xff69686b, 0xffd5d4db, 0xfff1f0f8, +0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, +0xff95abbf, 0xff92a8bc, 0xffececec, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, +0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffb6b6bb, 0xff303031, 0xff292929, 0xff3a3a3a, 0xff4f4e4e, 0xff494949, +0xff656567, 0xffd5d5db, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, +0xffefeff6, 0xffefeff6, 0xff92a8bc, 0xff8ea5b9, 0xffebebeb, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, +0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xff929296, 0xff222223, 0xff292929, 0xff303232, +0xff414747, 0xff4d4f4f, 0xff424141, 0xff78777a, 0xffdfdfe6, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, +0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xff8ea5b9, 0xff8ba2b6, 0xffe9e9e9, 0xffececf4, 0xffececf4, 0xffececf4, +0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffd5d5dc, 0xff5b5b5e, 0xff222525, +0xff212828, 0xff3a2e2e, 0xff5c3e3e, 0xff534a4a, 0xff3e4646, 0xff363737, 0xff9a999e, 0xffebebf3, 0xffececf4, 0xffececf4, +0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xff8ba2b6, 0xff879fb3, 0xffe8e8e8, 0xffebebf3, +0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffa9a8ae, +0xff292e2f, 0xff202626, 0xff6c2c2c, 0xffdb4040, 0xffff4d4d, 0xffdf4a4a, 0xff774040, 0xff353b3b, 0xff4d5153, 0xffc8c8cf, +0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xff879fb3, 0xff849cb0, +0xffe7e7e7, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, +0xffd8d8df, 0xff636568, 0xff182424, 0xff5a2626, 0xffdf3838, 0xffff4b4b, 0xffff5757, 0xffff5a5a, 0xffef4747, 0xff6f3636, +0xff2c3535, 0xff8a8b8f, 0xffe5e5ed, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, +0xff849cb0, 0xff8098ac, 0xffe6e6e6, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, +0xffe7e7f0, 0xffe7e7f0, 0xffaeaeb4, 0xff212627, 0xff201e1e, 0xff752121, 0xffd93434, 0xfffa4242, 0xffff5050, 0xffff5252, +0xffff4747, 0xffaa3333, 0xff2f2727, 0xff3b4143, 0xffcdcdd5, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, +0xffe7e7f0, 0xffe7e7f0, 0xff8098ac, 0xff7c95a9, 0xffe4e4e4, 0xffe6e6ee, 0xffe6e6ee, 0xffe6e6ee, 0xffe6e6ee, 0xffe5e5ed, +0xffd4d4dc, 0xffbdbdc3, 0xffafafb4, 0xff919196, 0xff4f4f51, 0xff1c2222, 0xff221b1b, 0xff591616, 0xff9f2727, 0xffcc3434, +0xffe63b3b, 0xffed3d3d, 0xffef3535, 0xffaa3030, 0xff635252, 0xff616868, 0xffb1b1b7, 0xffe6e6ee, 0xffe6e6ee, 0xffe0e0e8, +0xffc4c4ca, 0xffdbdbe2, 0xffe6e6ee, 0xffe6e6ee, 0xff7c95a9, 0xff7891a6, 0xffe3e3e3, 0xffe4e4ed, 0xffe4e4ed, 0xffe4e4ed, +0xffdddde6, 0xff89878a, 0xff4a4846, 0xff322e2c, 0xff1d1a1a, 0xff2d2d2e, 0xff787777, 0xffb1b4b4, 0xff706d6d, 0xff350f0f, +0xff631313, 0xff952626, 0xffb02c2c, 0xffbc3131, 0xffa21515, 0xff923c3c, 0xffd2c6c6, 0xffffffff, 0xffa2a2a4, 0xffb9b9c0, +0xffe4e4ed, 0xffc4c4cb, 0xff59595b, 0xff9f9fa5, 0xffe2e2eb, 0xffe4e4ed, 0xff7891a6, 0xff748ea2, 0xffe1e1e1, 0xffe2e2eb, +0xffe0e0e8, 0xffa9a9af, 0xff5b5b5e, 0xff5a6b7c, 0xff6f8da9, 0xff6f8495, 0xff76797f, 0xff5b5a5c, 0xffa6a6a7, 0xffe8e9e9, +0xff949595, 0xff231616, 0xff280101, 0xff571717, 0xff741e1e, 0xff7d2121, 0xff4e0000, 0xff7e5858, 0xffeceaea, 0xffffffff, +0xffc8c8c8, 0xff525254, 0xffd1d1d9, 0xffc9c9d1, 0xff272728, 0xff838388, 0xffe0e0e8, 0xffe2e2eb, 0xff748ea2, 0xff708a9f, +0xffe0e0e0, 0xffdadbe4, 0xff79797c, 0xff41474a, 0xff7d9ebd, 0xff9acdfb, 0xff96ceff, 0xff9ed4fc, 0xff93b4ca, 0xff858c93, +0xffa7a3a1, 0xffc7c7c7, 0xff868787, 0xff2a2929, 0xff090000, 0xff1a0404, 0xff2d0b0b, 0xff220101, 0xff200b0b, 0xffa6a1a1, +0xfffeffff, 0xffffffff, 0xffefefef, 0xff4e4e4e, 0xff9c9da3, 0xffd6d7df, 0xff333335, 0xff909196, 0xffdedfe8, 0xffe0e1ea, +0xff708a9f, 0xff6c879b, 0xffdedede, 0xffcbccd4, 0xff424141, 0xff484f55, 0xff87add0, 0xff9bc5ef, 0xffabc9dc, 0xff9db6cc, +0xff8492a7, 0xff909193, 0xffafadac, 0xffb7b7b7, 0xff858686, 0xff3d3f3f, 0xff1a1919, 0xff130e0e, 0xff0a0404, 0xff040000, +0xff565858, 0xffe0e1e1, 0xffffffff, 0xffffffff, 0xffffffff, 0xff6f6f6f, 0xff66666a, 0xff999aa0, 0xff3f3f40, 0xff6f6f73, +0xffd6d7df, 0xffdedfe8, 0xff6c879b, 0xff688397, 0xffdddddd, 0xffa3a4ab, 0xff222122, 0xff33302d, 0xff313435, 0xff636266, +0xffccc2c0, 0xffc7bbb5, 0xff8c8074, 0xff968e84, 0xffb1b2b3, 0xffb2b2b3, 0xff919191, 0xff5a5a5a, 0xff313333, 0xff282828, +0xff292929, 0xff515252, 0xffb6b6b6, 0xfffafafa, 0xffffffff, 0xffffffff, 0xffffffff, 0xff8d8d8d, 0xff2b2b2c, 0xff2b2b2c, +0xff2e2e2e, 0xff3e3e3e, 0xffc4c5cd, 0xffdcdde6, 0xff688397, 0xff647f94, 0xffdcdcdc, 0xff8c8d93, 0xff242524, 0xff4c463b, +0xff403426, 0xff191612, 0xff32312c, 0xff655d4c, 0xff7b6b53, 0xff9b9288, 0xffb2b4b7, 0xffb3b3b3, 0xffa3a3a3, 0xff878787, +0xff686868, 0xff5f5f5f, 0xff757575, 0xffaeaeae, 0xffececec, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffafafb1, +0xff424245, 0xff101010, 0xff1f1f1f, 0xff2c2c2d, 0xffbebfc7, 0xffdadbe5, 0xff647f94, 0xff607c90, 0xffdadada, 0xffa1a2a8, +0xff191a1a, 0xff4f4a41, 0xff6f604c, 0xff26231c, 0xff000000, 0xff131511, 0xff5b5449, 0xff9a9793, 0xffb5b6b7, 0xffb8b8b8, +0xffb3b3b3, 0xffacacac, 0xffa4a4a4, 0xffa6a6a6, 0xffb9b9b9, 0xffdfdfdf, 0xfffcfcfc, 0xffffffff, 0xffffffff, 0xffffffff, +0xffffffff, 0xffb6b6b8, 0xffa1a2a9, 0xff353537, 0xff1a1a1a, 0xff343435, 0xffc6c7cf, 0xffd9dae3, 0xff607c90, 0xff5c788d, +0xffd9d9d9, 0xffc4c5ce, 0xff313233, 0xff2f2d2b, 0xff3a3935, 0xff353839, 0xff54585c, 0xff676a6f, 0xff606266, 0xff989798, +0xffb7b7b7, 0xffb9b9b9, 0xffbcbcbc, 0xffbebebe, 0xffc1c1c1, 0xffc8c8c8, 0xffd8d8d8, 0xfff2f2f2, 0xffffffff, 0xffffffff, +0xffffffff, 0xffffffff, 0xffffffff, 0xffb1b1b1, 0xffacadb5, 0xffa0a1a8, 0xff252627, 0xff74757a, 0xffd1d2dc, 0xffd7d8e2, +0xff5c788d, 0xff58758a, 0xffd7d7d7, 0xffd3d4de, 0xff88888f, 0xff1b1b1d, 0xff74767b, 0xffbabcc4, 0xffcfd0da, 0xffcccdd6, +0xff818186, 0xff9d9d9d, 0xffb0b0b0, 0xffb7b7b7, 0xffbcbcbc, 0xffc1c1c1, 0xffc9c9c9, 0xffd4d4d4, 0xffe4e4e4, 0xfff7f7f7, +0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffb0b0b0, 0xff8b8c91, 0xffcdced8, 0xffb2b2bb, 0xffcbccd6, +0xffd5d6e0, 0xffd5d6e0, 0xff58758a, 0xff547186, 0xffd6d6d6, 0xffd3d5df, 0xffcbcdd6, 0xffb1b3bb, 0xffd1d2dc, 0xffd3d5df, +0xffd3d5df, 0xffc1c3cc, 0xff737477, 0xff989898, 0xffa6a6a6, 0xffadadad, 0xffb4b4b4, 0xffbababa, 0xffc3c3c3, 0xffcfcfcf, +0xffdddddd, 0xffeaeaea, 0xfff6f6f6, 0xfffefefe, 0xffffffff, 0xffffffff, 0xffffffff, 0xffbbbbbb, 0xff8c8d91, 0xffcbcdd6, +0xffd3d5df, 0xffd3d5df, 0xffd3d5df, 0xffd3d5df, 0xff547186, 0xff516e83, 0xffd6d6d6, 0xffd0d1db, 0xffd0d1da, 0xffd0d1db, +0xffc9cad3, 0xffc2c2cc, 0xffc4c5ce, 0xffb5b6be, 0xff68696b, 0xff8b8b8b, 0xff969696, 0xff9b9b9b, 0xffa1a1a1, 0xffa8a8a8, +0xffb1b1b1, 0xffbbbbbb, 0xffc6c6c6, 0xffd1d1d1, 0xffdddddd, 0xffeaeaea, 0xfff5f5f5, 0xfffefefe, 0xffffffff, 0xffcbcbcb, +0xff939398, 0xffcdced7, 0xffd2d3dd, 0xffd2d3dd, 0xffd2d3dd, 0xffd2d3dd, 0xff516e83, 0xff4d6b80, 0xffd8d8d8, 0xffcbccd7, +0xffc1c2cc, 0xffb7b8c1, 0xffadaeb7, 0xffa2a3ac, 0xff9d9ea7, 0xff909098, 0xff5c5c5f, 0xff7e7e7e, 0xff7e7e7e, 0xff7d7d7d, +0xff808080, 0xff868686, 0xff8e8e8e, 0xff969696, 0xffa0a0a0, 0xffababab, 0xffbababa, 0xffc9c9c9, 0xffdadada, 0xffebebeb, +0xfff9f9f9, 0xffcbcbcb, 0xff9c9da2, 0xffcccdd7, 0xffd0d1dc, 0xffd0d1dc, 0xffd0d1dc, 0xffd0d1dc, 0xff4d6b80, 0xff4a687d, +0xffd8d8d8, 0xffbcbec8, 0xffaaacb5, 0xff999ba3, 0xff898a91, 0xff76777d, 0xff696a70, 0xff5d5e62, 0xff4a4b4d, 0xff767676, +0xff6d6d6d, 0xff585858, 0xff525252, 0xff535353, 0xff5a5a5a, 0xff616161, 0xff696969, 0xff747474, 0xff858585, 0xff9d9d9d, +0xffbababa, 0xffd6d6d6, 0xffececec, 0xffcacaca, 0xff999a9f, 0xffcaccd7, 0xffced0db, 0xffced0db, 0xffced0db, 0xffced0db, +0xff4a687d, 0xff46657a, 0xffd7d7d7, 0xffabadb6, 0xff909199, 0xff7d7e85, 0xff68696e, 0xff4f5054, 0xff404144, 0xff333437, +0xff2e2e30, 0xff666666, 0xff717171, 0xff4c4c4c, 0xff373737, 0xff303030, 0xff2f2f2f, 0xff2f3030, 0xff343435, 0xff3c3d3d, +0xff4b4b4b, 0xff686868, 0xff939393, 0xffc0c0c0, 0xffe1e1e1, 0xffbebebe, 0xff85878d, 0xffc7c9d4, 0xffcdcfda, 0xffcdcfda, +0xffcdcfda, 0xffcdcfda, 0xff46657a, 0xbf436177, 0xffafb7bc, 0xffb2b2bc, 0xff9d9ea6, 0xff8e8f97, 0xff87888f, 0xff7e7f86, +0xff76777d, 0xff626267, 0xff333336, 0xff2d2d2d, 0xff565656, 0xff484848, 0xff2d2d2d, 0xff1e1e1f, 0xff2a2a2c, 0xff393a3d, +0xff39393c, 0xff2a2b2c, 0xff262626, 0xff3c3c3c, 0xff686868, 0xffa1a1a1, 0xffc4c4c4, 0xff878788, 0xff96979f, 0xffc0c1cb, +0xffc2c3cd, 0xffc9cad5, 0xffcccdd8, 0xffafb7bc, 0xbf436177, 0x7f405e74, 0xff8797a2, 0xffc7c8d3, 0xffc4c5cf, 0xffc2c3ce, +0xffc4c5cf, 0xffc5c6d1, 0xffc1c2cc, 0xffb2b3bd, 0xff8d8e95, 0xff56575b, 0xff434346, 0xff464649, 0xff424246, 0xff4f4f53, +0xff6f7076, 0xff8a8a92, 0xff85868d, 0xff5f5f64, 0xff2d2d2f, 0xff181818, 0xff343434, 0xff5c5c5c, 0xff626262, 0xff606064, +0xffafb0ba, 0xffb9bac4, 0xffbbbcc6, 0xffc5c6d0, 0xffcbccd7, 0xff8797a2, 0x7f405e74, 0x40405c74, 0xff4f6676, 0xffa5afb6, +0xffc9cbd7, 0xffc9cbd7, 0xffc9cbd7, 0xffc9cbd7, 0xffc9cbd7, 0xffc7c9d5, 0xffc6c8d4, 0xffc0c2ce, 0xffb9bbc6, 0xffb5b7c2, +0xffb4b6c0, 0xffb5b7c2, 0xffbcbeca, 0xffc3c5d1, 0xffc2c4cf, 0xffb5b7c2, 0xff9b9da6, 0xff76777e, 0xff56565b, 0xff4d4e52, +0xff6c6e74, 0xffaeb0ba, 0xffc5c7d3, 0xffc5c7d3, 0xffc7c9d4, 0xffc8cad6, 0xffa5afb6, 0xff4f6676, 0x40405c74, 0x0, +0x403c5c70, 0xff4e6676, 0xff768590, 0xffacb4b9, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, +0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, +0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffacb4b9, 0xff768590, 0xff4e6676, 0x403c5c70, +0x0, 0x0, 0x0, 0x40385870, 0x7f38586e, 0xbf39586d, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, +0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, +0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xbf39586d, 0x7f38586e, +0x40385870, 0x0, 0x0, }; } diff -r 9c44278ad34b -r a2d7e774507e generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java --- a/generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java Wed May 13 01:31:07 2009 +0100 +++ b/generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java Thu May 14 10:32:51 2009 +0100 @@ -1,5 +1,236 @@ package sun.awt.X11; package sun.awt.X11; public class XAWTIcon32_java_icon48_png { public static int[] java_icon48_png = { -0,0 -}; } +48,48, +0x0, +0x0, 0x33a0b9c8, 0x96a1b8ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, +0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, +0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, +0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, +0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0x9fa2b7ca, 0x4ba3b8c9, 0x0, 0x0, 0x0, 0x66a0b7c8, 0xfca1b6c9, +0xffcad3da, 0xfff0f0f2, 0xfff4f3f6, 0xfff6f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, +0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, +0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, +0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff6f6f9, 0xfff4f4f7, +0xfff1f1f3, 0xffced6dd, 0xffb3c1cf, 0x99a2b6ca, 0x0, 0x21a2b2c9, 0xf99fb5c8, 0xffdce0e4, 0xfff5f4fa, 0xfff5f4fb, +0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, +0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xff9f9ea2, 0xff585859, 0xffb7b6bb, 0xfff3f2f8, +0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, +0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff7f6fc, +0xfffdfdfe, 0xffb2c1ce, 0x4ea0b4c7, 0x789db3c6, 0xffc0cad4, 0xfff4f4fa, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, +0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, +0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff3f3fa, 0xff86868a, 0xff3b3b3b, 0xff4e4e4e, 0xffa6a6ab, 0xffededf3, 0xfff4f4fb, +0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, +0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff6f6fc, 0xffd1d7df, +0x9f9fb4c5, 0xff9cb2c5, 0xffe8e9ed, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, +0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, +0xfff4f3fa, 0xffe3e2e9, 0xff656467, 0xff2c2c2c, 0xff464646, 0xff484848, 0xff969599, 0xffe8e7ed, 0xfff4f3fa, 0xfff4f3fa, +0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, +0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff1f1f5, 0xff9cb2c5, 0xff9ab0c4, +0xfff1f0f5, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, +0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xffd3d2d8, +0xff4a4a4c, 0xff262626, 0xff3a3a3a, 0xff4c4c4c, 0xff434343, 0xff828285, 0xffe3e2e8, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, +0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, +0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff2f1f6, 0xff9ab0c4, 0xff99afc2, 0xfff1f1f5, 0xfff2f2f9, +0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, +0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xffb8b8bd, 0xff343435, 0xff242424, +0xff323232, 0xff474747, 0xff4e4e4e, 0xff414141, 0xff747477, 0xffd7d7de, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, +0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, +0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff1f1f6, 0xff99afc2, 0xff97adc0, 0xfff0f0f4, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, +0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, +0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xff949498, 0xff2c2c2c, 0xff262626, 0xff2d2d2d, 0xff3d3d3d, +0xff4d4d4d, 0xff4c4c4c, 0xff3f3f3f, 0xff6a6a6d, 0xffd1d1d7, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, +0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, +0xfff1f1f8, 0xfff0f0f5, 0xff97adc0, 0xff95abbf, 0xfff0eff4, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, +0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, +0xfff1f0f8, 0xfff1f0f8, 0xffe7e6ed, 0xff6e6e71, 0xff242424, 0xff262626, 0xff2a2a2a, 0xff373737, 0xff474747, 0xff505050, +0xff484848, 0xff3e3e3e, 0xff646366, 0xffd2d1d8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, +0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff0eff5, +0xff95abbf, 0xff93a9bd, 0xffefeef3, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, +0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, +0xffcecdd4, 0xff48484a, 0xff222222, 0xff262626, 0xff2a2a2a, 0xff343434, 0xff414040, 0xff4c4c4c, 0xff4f4e4e, 0xff434343, +0xff3c3c3c, 0xff6d6d70, 0xffdddce3, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, +0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xffefeef4, 0xff93a9bd, 0xff91a7bb, +0xffeeeef2, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, +0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffa4a4a9, 0xff2f2f30, +0xff242424, 0xff272727, 0xff2b2a2a, 0xff2f3030, 0xff373c3c, 0xff424848, 0xff4e5050, 0xff4a4949, 0xff3e3d3d, 0xff383838, +0xff87878b, 0xffeaeaf1, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, +0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffeeeef3, 0xff91a7bb, 0xff8ea5b9, 0xffededf1, 0xffeeeef5, +0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, +0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffe4e4eb, 0xff666669, 0xff232323, 0xff242424, 0xff272626, +0xff222929, 0xff222e2e, 0xff2f3737, 0xff3b4141, 0xff414c4c, 0xff444d4d, 0xff3f4040, 0xff393939, 0xff3e3e3e, 0xffadadb2, +0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, +0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffededf2, 0xff8ea5b9, 0xff8ca3b7, 0xffececf0, 0xffededf4, 0xffededf4, 0xffededf4, +0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, +0xffededf4, 0xffededf4, 0xffededf4, 0xffbababf, 0xff363637, 0xff242323, 0xff232626, 0xff1b2626, 0xff2a2828, 0xff5c3030, +0xff8c3a3a, 0xff984040, 0xff7d4343, 0xff544646, 0xff394444, 0xff343838, 0xff393838, 0xff575759, 0xffd4d4da, 0xffededf4, +0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, +0xffededf4, 0xffececf1, 0xff8ca3b7, 0xff8aa1b5, 0xffebebf0, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, +0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, +0xffe8e8ef, 0xff76767a, 0xff262425, 0xff222525, 0xff182525, 0xff3e2525, 0xffa03232, 0xffeb4242, 0xffff4c4c, 0xffff4f4f, +0xfffa4949, 0xffc54343, 0xff6c3e3e, 0xff323b3b, 0xff333636, 0xff363535, 0xff8f8f93, 0xffe9e9f1, 0xffececf4, 0xffececf4, +0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffebebf1, +0xff8aa1b5, 0xff879fb3, 0xffeaeaef, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, +0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffbebec4, 0xff404041, +0xff222323, 0xff182424, 0xff372323, 0xffb32e2e, 0xffff4141, 0xffff4c4c, 0xffff5151, 0xffff5555, 0xffff5555, 0xffff5050, +0xffe34141, 0xff693838, 0xff2c3535, 0xff353737, 0xff4b4a4b, 0xffccccd3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, +0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffeaeaf0, 0xff879fb3, 0xff859db1, +0xffe9e9ee, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, +0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffe6e6ee, 0xff7a7a7e, 0xff262626, 0xff1b2424, 0xff212121, +0xff7a2424, 0xffe53636, 0xffff4141, 0xffff4747, 0xffff5050, 0xffff5a5a, 0xffff5a5a, 0xffff5454, 0xffff4c4c, 0xffcc3939, +0xff473232, 0xff2a3434, 0xff343434, 0xff909095, 0xffe8e8f0, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, +0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffeaeaf2, 0xffe9e9ef, 0xff859db1, 0xff829baf, 0xffe8e8ed, 0xffe9e9f1, +0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, +0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffc6c6cd, 0xff424143, 0xff212323, 0xff192323, 0xff361d1d, 0xff8e2222, 0xffcc3232, +0xffec3b3b, 0xfffb4040, 0xffff4b4b, 0xffff5656, 0xffff5757, 0xffff4e4e, 0xffff4949, 0xfffc3c3c, 0xff752f2f, 0xff2b3232, +0xff333737, 0xff4e4d4f, 0xffd7d7de, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, +0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe8e8ee, 0xff829baf, 0xff8098ac, 0xffe6e6ec, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, +0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, +0xffe4e4ed, 0xff7f7f83, 0xff1d1d1d, 0xff1c2020, 0xff1b2020, 0xff3b1818, 0xff7d1d1d, 0xffa92929, 0xffc83232, 0xffe33838, +0xfff43f3f, 0xfffa4444, 0xfffd4646, 0xfffc4242, 0xfff83f3f, 0xfff43b3b, 0xff892929, 0xff201f1f, 0xff181f1f, 0xff201f20, +0xffa3a3a9, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, +0xffe7e7f0, 0xffe6e6ed, 0xff8098ac, 0xff7d96aa, 0xffe6e6eb, 0xffe6e6ef, 0xffe6e6ef, 0xffe6e6ef, 0xffe6e6ef, 0xffe6e6ef, +0xffe6e6ef, 0xffe6e6ef, 0xffe6e6ef, 0xffd0d0d8, 0xffbdbdc4, 0xffadadb3, 0xff9b9ba1, 0xff88888d, 0xff707073, 0xff313233, +0xff151313, 0xff131616, 0xff101212, 0xff2d0e0e, 0xff651818, 0xff8a2323, 0xffa72a2a, 0xffc23131, 0xffd53535, 0xffe03737, +0xffe63939, 0xffe43838, 0xffdb3737, 0xffd03030, 0xff882a2a, 0xff5b5555, 0xff6d7373, 0xff7d7d7d, 0xff88888b, 0xffe6e6ef, +0xffe6e6ef, 0xffe6e6ef, 0xffe6e6ef, 0xffe6e6ef, 0xffd9d9e1, 0xffb8b8bf, 0xffcfcfd7, 0xffe6e6ef, 0xffe6e6ef, 0xffe6e6ec, +0xff7d96aa, 0xff7b94a8, 0xffe5e5ea, 0xffe5e5ee, 0xffe5e5ee, 0xffe5e5ee, 0xffe5e5ee, 0xffe5e5ee, 0xffe5e5ee, 0xffb0b0b7, +0xff767679, 0xff5b5b5d, 0xff4e4d4e, 0xff454546, 0xff383839, 0xff2e2e2e, 0xff393939, 0xff6a6969, 0xff8a8a8a, 0xff858787, +0xff5f6161, 0xff301b1b, 0xff420909, 0xff6b1a1a, 0xff862222, 0xffa02929, 0xffb32d2d, 0xffbe2f2f, 0xffc43030, 0xffc13030, +0xffbc3131, 0xffa01919, 0xff8c4040, 0xffcec6c6, 0xfff0f1f1, 0xfff7f7f7, 0xffc9c9ca, 0xffb2b2b8, 0xffe5e5ee, 0xffe5e5ee, +0xffe5e5ee, 0xffe3e3ec, 0xff9c9ca2, 0xff5d5d5f, 0xff808083, 0xffd8d8e1, 0xffe4e4ed, 0xffe5e5eb, 0xff7b94a8, 0xff7891a6, +0xffe4e4e9, 0xffe4e4ed, 0xffe4e4ed, 0xffe4e4ed, 0xffe4e4ed, 0xffc7c7cf, 0xff7e7b7e, 0xff3d3836, 0xff23201c, 0xff1b1814, +0xff272320, 0xff191615, 0xff0f0e0e, 0xff0c0c0c, 0xff424242, 0xffacabab, 0xffdbdbdb, 0xffe1e3e3, 0xffb4b7b7, 0xff443a3a, +0xff210000, 0xff490f0f, 0xff651b1b, 0xff7d2020, 0xff922424, 0xff9e2828, 0xffa12828, 0xff9d2727, 0xff9a2929, 0xff6e0606, +0xff895858, 0xfff1eded, 0xffffffff, 0xffffffff, 0xfff1f1f1, 0xff676768, 0xff848489, 0xffe2e2eb, 0xffe4e4ed, 0xffe0e0e9, +0xff7e7e83, 0xff363636, 0xff515153, 0xffbcbcc4, 0xffe2e2eb, 0xffe4e4ea, 0xff7891a6, 0xff758fa3, 0xffe3e3e8, 0xffe3e3ec, +0xffe3e3ec, 0xffd8d8e0, 0xff919095, 0xff4b4947, 0xff3c4144, 0xff5a6e7c, 0xff66849b, 0xff738da3, 0xff81909f, 0xff8c9096, +0xff8c8c91, 0xff535356, 0xff5f6060, 0xffb7b7b7, 0xffcdcdcd, 0xffcccccc, 0xffabadad, 0xff494646, 0xff100202, 0xff270707, +0xff421111, 0xff551616, 0xff6b1a1a, 0xff7a1f1f, 0xff7b1f1f, 0xff761e1e, 0xff6b1717, 0xff3b0000, 0xff978383, 0xfff8f9f9, +0xffffffff, 0xffffffff, 0xfff5f5f5, 0xff818181, 0xff2e2e2f, 0xffa8a8af, 0xffe3e3ec, 0xffe2e2eb, 0xff909095, 0xff0e0e0e, +0xff39393a, 0xffb7b7be, 0xffe0e0e9, 0xffe3e3e9, 0xff758fa3, 0xff738da1, 0xffe1e2e7, 0xffd4d5de, 0xff9e9fa5, 0xff616163, +0xff363535, 0xff576674, 0xff88b0d4, 0xff94c5f0, 0xff91c5ff, 0xff96c9ff, 0xffa3d2f7, 0xffa1c2d9, 0xffacb5bf, 0xffb2b4ba, +0xff878687, 0xffbababa, 0xffc3c3c3, 0xffbab9b9, 0xff989999, 0xff505050, 0xff100b0b, 0xff0c0000, 0xff210707, 0xff2f0c0c, +0xff3f0f0f, 0xff4c1313, 0xff4e1414, 0xff4c1414, 0xff280202, 0xff362020, 0xffc9c8c8, 0xffffffff, 0xffffffff, 0xffffffff, +0xfffcfcfc, 0xffb0b0b0, 0xff262626, 0xff66666a, 0xffe0e1ea, 0xffe1e2eb, 0xffa0a0a7, 0xff070707, 0xff3a3a3c, 0xffc7c7cf, +0xffdfe0e9, 0xffe1e2e8, 0xff738da1, 0xff708a9f, 0xffe0e1e6, 0xffcacad3, 0xff3c3a3b, 0xff262627, 0xff546875, 0xff9ac6ed, +0xff9accff, 0xff94c8ff, 0xff91c9ff, 0xff94ccff, 0xff9bd5ff, 0xffa6e1ff, 0xff97c4e6, 0xff7d8b95, 0xff898684, 0xffbab8b7, +0xffbdbebe, 0xffb1b1b1, 0xff919090, 0xff575858, 0xff222323, 0xff0c0707, 0xff0b0000, 0xff120202, 0xff180606, 0xff1e0606, +0xff210606, 0xff150202, 0xff0a0202, 0xff787777, 0xfff1f1f1, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffdbdbdb, +0xff3a3a3a, 0xff3d3d3f, 0xffc3c4cc, 0xffe0e1ea, 0xff9b9ca2, 0xff212121, 0xff545456, 0xffc9c9d1, 0xffdedfe7, 0xffe0e1e7, +0xff708a9f, 0xff6b859a, 0xffdedee4, 0xffacacb3, 0xff282828, 0xff363737, 0xff6a7e8b, 0xffa3d2fd, 0xff99ccff, 0xff93c4f4, +0xffa6d2e7, 0xffabd1de, 0xff8bb0d0, 0xff7593b5, 0xff76859a, 0xff7d7f84, 0xff979493, 0xffb5b4b4, 0xffb8b9b9, 0xffababab, +0xff8f8f8f, 0xff5b5c5c, 0xff2e3030, 0xff212121, 0xff171414, 0xff0d0606, 0xff080101, 0xff090101, 0xff090202, 0xff0a0707, +0xff404040, 0xffb8baba, 0xfffcfcfc, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffebebeb, 0xff565656, 0xff262627, +0xff98989f, 0xffdcdce5, 0xff6e6e72, 0xff333333, 0xff535354, 0xffa3a3aa, 0xffdbdbe5, 0xffdfdfe6, 0xff6b859a, 0xff688397, +0xffdadadf, 0xff6c6c70, 0xff242424, 0xff2c2c2c, 0xff37393c, 0xff60707f, 0xff72899e, 0xff9099a8, 0xffc7cbcf, 0xffd6d9da, +0xffb4b0b6, 0xff8d848b, 0xff8d8383, 0xff938f88, 0xff9f9e9c, 0xffb1b2b3, 0xffb5b4b5, 0xffa8a8a8, 0xff929292, 0xff696969, +0xff3a3a3a, 0xff272828, 0xff282929, 0xff252424, 0xff1f1d1d, 0xff1a1919, 0xff1c1c1c, 0xff393939, 0xff888888, 0xffdfdfdf, +0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfff2f2f2, 0xff787878, 0xff121212, 0xff606063, 0xff7e7e83, +0xff2f2f2f, 0xff3c3c3c, 0xff4c4c4c, 0xff707073, 0xffb4b4bc, 0xffdedee4, 0xff688397, 0xff658095, 0xffccccd1, 0xff414244, +0xff242424, 0xff302f2f, 0xff32312d, 0xff1f1f1e, 0xff373736, 0xff756f6d, 0xffe2d8d5, 0xfffdf5ef, 0xffcac1ba, 0xff9a9389, +0xff867c6e, 0xff8d8375, 0xffa3a1a0, 0xffb2b3b5, 0xffb3b3b2, 0xffa9a9a9, 0xff979797, 0xff7d7d7d, 0xff565656, 0xff373636, +0xff2c2d2d, 0xff292929, 0xff282828, 0xff303030, 0xff4c4c4c, 0xff7e7e7e, 0xffc1c1c1, 0xfff5f5f5, 0xffffffff, 0xffffffff, +0xffffffff, 0xffffffff, 0xffffffff, 0xfff9f9f9, 0xff9d9e9e, 0xff252627, 0xff2d2d2e, 0xff2b2c2d, 0xff111111, 0xff282828, +0xff343434, 0xff4e4e50, 0xff8e8f94, 0xffdcdde3, 0xff658095, 0xff637e93, 0xffbbbcc0, 0xff2b2b2d, 0xff252626, 0xff413e3a, +0xff4b4232, 0xff252017, 0xff0f0c0b, 0xff1b1b18, 0xff3f3e3b, 0xff706c64, 0xff8f8572, 0xff6d5f4a, 0xff6d5d46, 0xff958a7d, +0xffa8a8a8, 0xffb0b1b2, 0xffb3b2b3, 0xffacacac, 0xff9f9f9f, 0xff8e8e8e, 0xff767676, 0xff5c5c5c, 0xff4d4d4d, 0xff494949, +0xff535353, 0xff696969, 0xff8a8a8a, 0xffb6b6b6, 0xffe4e4e4, 0xfffdfdfd, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, +0xffffffff, 0xffffffff, 0xffbcbcbd, 0xff5f5f62, 0xff111112, 0xff141414, 0xff101010, 0xff1c1c1c, 0xff242424, 0xff464648, +0xff84858a, 0xffdbdce2, 0xff637e93, 0xff607c90, 0xffbbbcc0, 0xff28292b, 0xff212122, 0xff45433f, 0xff5b4d3b, 0xff5a4b3a, +0xff443a2d, 0xff171410, 0xff010100, 0xff090908, 0xff423b2c, 0xff79664b, 0xff84735c, 0xff9e958b, 0xffa8a7aa, 0xffb2b2b3, +0xffb5b5b4, 0xffafafaf, 0xffaaaaaa, 0xffa0a0a0, 0xff929292, 0xff848484, 0xff7b7b7b, 0xff7c7c7c, 0xff888888, 0xff9b9b9b, +0xffb5b5b5, 0xffd7d7d7, 0xfff6f6f6, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfffefefe, +0xffc8c8c9, 0xff8f9095, 0xff424245, 0xff060606, 0xff161616, 0xff2d2d2d, 0xff3a3a3a, 0xff4e4e50, 0xff8b8b91, 0xffdadbe1, +0xff607c90, 0xff5d798e, 0xffcccdd2, 0xff414144, 0xff1c1c1c, 0xff3f3e3c, 0xff5e5344, 0xff70614b, 0xff5b4f40, 0xff0d0e0b, +0xff000001, 0xff000606, 0xff171a16, 0xff4b4437, 0xff6c6459, 0xff91908d, 0xffabacac, 0xffb3b3b3, 0xffb6b6b6, 0xffb6b6b6, +0xffb3b3b3, 0xffaeaeae, 0xffa8a8a8, 0xffa2a2a2, 0xffa0a0a0, 0xffa2a2a2, 0xffaaaaaa, 0xffbababa, 0xffd3d3d3, 0xffececec, +0xfffdfdfd, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfffcfcfc, 0xffc2c2c2, 0xff8f8f94, +0xffbdbec6, 0xff434446, 0xff070707, 0xff111111, 0xff191919, 0xff505053, 0xffa3a4aa, 0xffd9dae0, 0xff5d798e, 0xff5b778c, +0xffd3d4da, 0xff67686c, 0xff141414, 0xff2b2b2c, 0xff514d44, 0xff574e40, 0xff39362f, 0xff080e10, 0xff0c1315, 0xff141b1d, +0xff141b1e, 0xff1e2327, 0xff4c4e51, 0xff949493, 0xffadadac, 0xffb2b2b2, 0xffb7b7b7, 0xffb9b9b9, 0xffb9b9b9, 0xffb7b7b7, +0xffb6b6b6, 0xffb7b7b7, 0xffb7b7b7, 0xffbababa, 0xffc3c3c3, 0xffd1d1d1, 0xffe4e4e4, 0xfff8f8f8, 0xffffffff, 0xffffffff, +0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfff9f9f9, 0xffbababa, 0xff7e7e82, 0xffd7d8e2, 0xffa5a6ae, +0xff161616, 0xff131313, 0xff1b1b1b, 0xff76767c, 0xffc4c5ce, 0xffd7d8df, 0xff5b778c, 0xff58758a, 0xffd5d5dc, 0xffa0a1a8, +0xff101010, 0xff191819, 0xff2e2e2f, 0xff1a1f1f, 0xff171f22, 0xff3d4044, 0xff616367, 0xff818289, 0xffa2a3ab, 0xff95979d, +0xff6e6d70, 0xff9a9a9a, 0xffaaaaaa, 0xffb1b1b1, 0xffb7b7b7, 0xffb9b9b9, 0xffbcbcbc, 0xffbdbdbd, 0xffbebebe, 0xffc2c2c2, +0xffc6c6c6, 0xffcbcbcb, 0xffd2d2d2, 0xffdddddd, 0xffededed, 0xfffbfbfb, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, +0xffffffff, 0xffffffff, 0xffffffff, 0xfff9f9f9, 0xffb6b6b6, 0xff737375, 0xffc7c8d1, 0xffc8c9d2, 0xff59595d, 0xff151516, +0xff454548, 0xffb4b5bd, 0xffd3d4de, 0xffd7d7df, 0xff58758a, 0xff567287, 0xffd6d6dd, 0xffcdced7, 0xff66666b, 0xff0e0e0e, +0xff1e1e1e, 0xff5c5d61, 0xffc4c5ce, 0xffcfd0da, 0xffd4d5df, 0xffd4d5df, 0xffd5d6e0, 0xffa9aab2, 0xff727173, 0xff9b9b9b, +0xffa8a8a8, 0xffb0b0b0, 0xffb5b5b5, 0xffb8b8b8, 0xffbbbbbb, 0xffbebebe, 0xffc1c1c1, 0xffc5c5c5, 0xffcbcbcb, 0xffd1d1d1, +0xffdadada, 0xffe4e4e4, 0xfff1f1f1, 0xfffcfcfc, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, +0xffffffff, 0xfff9f9f9, 0xffbababa, 0xff69696a, 0xffaeafb7, 0xffd5d6e0, 0xffd0d1db, 0xffc0c1ca, 0xffc8c9d2, 0xffd5d6e0, +0xffd5d6e0, 0xffd6d6de, 0xff567287, 0xff537085, 0xffd5d5dc, 0xffd4d5df, 0xffbebfc8, 0xff444447, 0xff5a5a5e, 0xffc7c8d1, +0xffd4d5df, 0xffd4d5df, 0xffd4d5df, 0xffd4d5df, 0xffd4d5df, 0xffa0a1a8, 0xff69696a, 0xff989898, 0xffa3a3a3, 0xffababab, +0xffb0b0b0, 0xffb4b4b4, 0xffb7b7b7, 0xffbbbbbb, 0xffbfbfbf, 0xffc5c5c5, 0xffcacaca, 0xffd1d1d1, 0xffdadada, 0xffe5e5e5, +0xfff0f0f0, 0xfff8f8f8, 0xfffdfdfd, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfffbfbfb, +0xffc4c4c4, 0xff6c6c6d, 0xffa0a1a8, 0xffd4d5df, 0xffd4d5df, 0xffd4d5df, 0xffd4d5df, 0xffd4d5df, 0xffd4d5df, 0xffd5d5dd, From ahughes at redhat.com Mon May 18 18:31:26 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 19 May 2009 01:31:26 +0000 Subject: changeset in /hg/icedtea: Update patches to apply against b58. Message-ID: changeset 9c44278ad34b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c44278ad34b description: Update patches to apply against b58. 2009-05-12 Andrew John Hughes * patches/icedtea-idl.patch, * patches/security/icedtea-6484091.patch, * patches/security/icedtea-6497740.patch, * patches/security/icedtea-6588160.patch, * patches/security/icedtea-6726779.patch, * patches/security/icedtea-6734167.patch, * patches/security/icedtea-6766136.patch: Removed, applied upstream in b51-b58. * HACKING: Updated. * Makefile.am: Remove obsolete patches, fix bad spacing on some variables. * patches/icedtea-libraries.patch, * patches/icedtea-rhino.patch, * patches/icedtea-security-updates.patch, * patches/icedtea-tests-jdk.patch, * patches/security/icedtea-6592792.patch, * patches/security/icedtea-6733959.patch, * patches/xrender/icedtea-001.patch: Recreated against b58. diffstat: 17 files changed, 248 insertions(+), 3021 deletions(-) ChangeLog | 22 HACKING | 12 Makefile.am | 19 patches/icedtea-idl.patch | 505 --------------------- patches/icedtea-libraries.patch | 198 ++++---- patches/icedtea-rhino.patch | 56 +- patches/icedtea-security-updates.patch | 662 ---------------------------- patches/icedtea-tests-jdk.patch | 16 patches/security/icedtea-6484091.patch | 76 --- patches/security/icedtea-6497740.patch | 742 -------------------------------- patches/security/icedtea-6588160.patch | 42 - patches/security/icedtea-6592792.patch | 141 ------ patches/security/icedtea-6726779.patch | 142 ------ patches/security/icedtea-6733959.patch | 210 --------- patches/security/icedtea-6734167.patch | 89 --- patches/security/icedtea-6766136.patch | 189 -------- patches/xrender/icedtea-001.patch | 148 +++--- diffs (truncated from 4388 to 500 lines): diff -r 21921f352706 -r 9c44278ad34b ChangeLog --- a/ChangeLog Thu May 07 16:58:42 2009 +0100 +++ b/ChangeLog Wed May 13 01:31:07 2009 +0100 @@ -1,3 +1,25 @@ 2009-05-07 Andrew John Hughes + + * patches/icedtea-idl.patch, + * patches/security/icedtea-6484091.patch, + * patches/security/icedtea-6497740.patch, + * patches/security/icedtea-6588160.patch, + * patches/security/icedtea-6726779.patch, + * patches/security/icedtea-6734167.patch, + * patches/security/icedtea-6766136.patch: + Removed, applied upstream in b51-b58. + * HACKING: Updated. + * Makefile.am: Remove obsolete patches, + fix bad spacing on some variables. + * patches/icedtea-libraries.patch, + * patches/icedtea-rhino.patch, + * patches/icedtea-security-updates.patch, + * patches/icedtea-tests-jdk.patch, + * patches/security/icedtea-6592792.patch, + * patches/security/icedtea-6733959.patch, + * patches/xrender/icedtea-001.patch: + Recreated against b58. + 2009-05-07 Andrew John Hughes * Makefile.am: diff -r 21921f352706 -r 9c44278ad34b HACKING --- a/HACKING Thu May 07 16:58:42 2009 +0100 +++ b/HACKING Wed May 13 01:31:07 2009 +0100 @@ -3,12 +3,6 @@ Patches PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) - -The following patches are applied early in the build to meet the Free Software guidelines and are also -included in the tarball resulting from the dist-openjdk-fsg target: - -* icedtea-idl.patch: Fix IDL licenses (PR141/S6695776). -* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140/S6695776). The fsg.sh script is also run to delete certain files with dubious licensing and/or only occuring in binary format. @@ -171,6 +165,12 @@ Obsolete Patches Obsolete Patches ================ +The following patches were applied early in the build to meet the Free Software guidelines and are also +included in the tarball resulting from the dist-openjdk-fsg target: + +* icedtea-idl.patch: Fix IDL licenses (PR141/S6565364). +* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140/S6695776). + The following patches were previously applied, but have been made obsolete by changes to the OpenJDK code base and/or changes within IcedTea: diff -r 21921f352706 -r 9c44278ad34b Makefile.am --- a/Makefile.am Thu May 07 16:58:42 2009 +0100 +++ b/Makefile.am Wed May 13 01:31:07 2009 +0100 @@ -1563,12 +1563,12 @@ 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_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_MD5SUM = $(HOTSPOT_MD5SUM) + HS_CHANGESET = $(HOTSPOT_CHANGESET) HS_URL = $(HOTSPOT_URL) endif @@ -1688,7 +1688,6 @@ endif endif endif endif -endif if ! echo "$(HS_MD5SUM) $(HOTSPOT_SRC_ZIP)" \ | $(MD5SUM) --check ; \ then \ @@ -1698,6 +1697,7 @@ endif fi ; \ $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \ fi +endif if WITH_CACAO if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP @@ -1839,8 +1839,7 @@ else SHARK_PATCH = endif -ICEDTEA_FSG_PATCHES = \ - patches/icedtea-idl.patch +ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ patches/icedtea-version.patch \ @@ -1912,15 +1911,9 @@ ICEDTEA_PATCHES = \ patches/icedtea-pr261.patch \ patches/icedtea-doc-headers.patch \ $(ZERO_PATCHES_COND) \ - patches/security/icedtea-6484091.patch \ - patches/security/icedtea-6497740.patch \ - patches/security/icedtea-6588160.patch \ patches/security/icedtea-6592792.patch \ - patches/security/icedtea-6726779.patch \ patches/security/icedtea-6733959.patch \ - patches/security/icedtea-6734167.patch \ patches/security/icedtea-6755943.patch \ - patches/security/icedtea-6766136.patch \ patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ patches/icedtea-demo-swingapplet.patch \ patches/icedtea-jvmtiEnv.patch \ diff -r 21921f352706 -r 9c44278ad34b patches/icedtea-idl.patch --- a/patches/icedtea-idl.patch Thu May 07 16:58:42 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,505 +0,0 @@ ---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set Wed Jun 25 10:48:45 2008 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set Wed Jun 25 10:48:45 2008 -@@ -1,11 +1,35 @@ - /* -+ * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. -+ * 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. Sun designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Sun in the LICENSE file that accompanied this code. -+ * -+ * 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. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/* - * COMPONENT_NAME: idl.parser -- * -+ * - * ORIGINS: 27 - * -- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM - * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 -- * -+ * - */ - - CORBA IDL ---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set Wed Jun 25 10:48:46 2008 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set Wed Jun 25 10:48:46 2008 -@@ -1,11 +1,35 @@ - /* -+ * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. -+ * 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. Sun designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Sun in the LICENSE file that accompanied this code. -+ * -+ * 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. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/* - * COMPONENT_NAME: idl.parser -- * -+ * - * ORIGINS: 27 - * -- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM - * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 -- * -+ * - */ - - CORBA IDL ---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Wed Jun 25 10:48:47 2008 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Wed Jun 25 10:48:47 2008 -@@ -1,14 +1,38 @@ - /* -+ * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. -+ * 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. Sun designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Sun in the LICENSE file that accompanied this code. -+ * -+ * 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. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/* - * COMPONENT_NAME: idl.parser -- * -+ * - * ORIGINS: 27 - * -- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM - * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 -- * -+ * - */ - --CORBA 2.3 IDL -+CORBA 2.3 IDL - --------------- - - (1) -@@ -83,7 +107,7 @@ - - (16) e - -- -+ - (17) "{" "}" - - (17) e -@@ -91,9 +115,9 @@ - - (18) "custom" "valuetype" - "valuetype" -- "custom" "valuetype" -- "valuetype" -- -+ "custom" "valuetype" -+ "valuetype" -+ - (19) - - (19) e -@@ -107,7 +131,7 @@ - "supports" - - (19) e -- "," -+ "," - - (20) - -@@ -121,7 +145,7 @@ - (23) "factory" "(" ")" - "factory" "(" ")" - --(24) -+(24) - "," - - (25) -@@ -349,7 +373,7 @@ - - (87) e - -- -+ - - - (88) "oneway" -@@ -386,7 +410,7 @@ - - - --(96) "fixed" "<" "," ">" -+(96) "fixed" "<" "," ">" - - (97) "fixed" - ---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Wed Jun 25 10:48:47 2008 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Wed Jun 25 10:48:47 2008 -@@ -1,11 +1,35 @@ - /* -+ * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. -+ * 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. Sun designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Sun in the LICENSE file that accompanied this code. -+ * -+ * 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. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/* - * COMPONENT_NAME: idl.parser -- * -+ * - * ORIGINS: 27 - * -- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM - * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 -- * -+ * - */ - - (1) // CORBA3 -@@ -98,7 +122,7 @@ - - (16) e - -- -+ - (17) "{" "}" - - (17) e -@@ -106,9 +130,9 @@ - - (18) "custom" "valuetype" - "valuetype" -- "custom" "valuetype" -- "valuetype" -- -+ "custom" "valuetype" -+ "valuetype" -+ - (19) - - (19) e -@@ -122,7 +146,7 @@ - "supports" - - (19) e -- "," -+ "," - - (20) - -@@ -136,7 +160,7 @@ - (23) "factory" "(" ")" - "factory" "(" ")" - --(24) -+(24) - "," - - (25) -@@ -351,7 +375,7 @@ - (85) // CORBA3 - - (85) "readonly" "attribute" // CORBA3 -- -+ - (85) // CORBA3 - // CORBA3 - -@@ -389,7 +413,7 @@ - - (87) e - -- -+ - - - (88) "oneway" -@@ -426,7 +450,7 @@ - - - --(96) "fixed" "<" "," ">" -+(96) "fixed" "<" "," ">" - - (97) "fixed" - -@@ -450,7 +474,7 @@ - - (204) e - "," -- -+ - (205) ":" - - (206) -@@ -458,8 +482,8 @@ - (206) e - - --(207) ";" -- ";" -+(207) ";" -+ ";" - ";" - ";" - ";" ---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Wed Jun 25 10:48:48 2008 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Wed Jun 25 10:48:48 2008 -@@ -1,4 +1,29 @@ - # -+# Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. -+# 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. Sun designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# 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. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+ -+# - # COMPONENT_NAME: idl.parser - # - # ORIGINS: 27 ---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Wed Jun 25 10:48:49 2008 -+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Wed Jun 25 10:48:49 2008 -@@ -1,4 +1,29 @@ - # -+# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. -+# 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. Sun designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# 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. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+ -+# - # COMPONENT_NAME: idl.parser - # From ahughes at redhat.com Mon May 18 18:31:28 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 19 May 2009 01:31:28 +0000 Subject: changeset in /hg/icedtea: Enable --with-icedtea by default. Message-ID: changeset 58c1bf70c801 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=58c1bf70c801 description: Enable --with-icedtea by default. 2009-05-14 Andrew John Hughes * configure.ac: Turn --with-icedtea on by default. Only this build works at present for b58. diffstat: 2 files changed, 7 insertions(+), 1 deletion(-) ChangeLog | 6 ++++++ configure.ac | 2 +- diffs (25 lines): diff -r 2a131daaa86d -r 58c1bf70c801 ChangeLog --- a/ChangeLog Thu May 14 21:25:31 2009 +0100 +++ b/ChangeLog Thu May 14 21:27:31 2009 +0100 @@ -1,3 +1,9 @@ 2009-05-14 Andrew John Hughes + + * configure.ac: + Turn --with-icedtea on by default. + Only this build works at present for b58. + 2009-05-14 Andrew John Hughes * Makefile.am: diff -r 2a131daaa86d -r 58c1bf70c801 configure.ac --- a/configure.ac Thu May 14 21:25:31 2009 +0100 +++ b/configure.ac Thu May 14 21:27:31 2009 +0100 @@ -50,7 +50,7 @@ AC_ARG_WITH([icedtea], fi ], [ - with_icedtea=false + with_icedtea=true ]) AM_CONDITIONAL(WITH_ICEDTEA, test "${with_icedtea}" = true) AC_MSG_RESULT(${with_icedtea}) From ahughes at redhat.com Mon May 18 18:31:28 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 19 May 2009 01:31:28 +0000 Subject: changeset in /hg/icedtea: Add support for --disable-nimbus. Message-ID: changeset 2a131daaa86d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2a131daaa86d description: Add support for --disable-nimbus. 2009-05-14 Andrew John Hughes * Makefile.am: Add support for DISABLE_NIMBUS, correct use of bootclasspath/sourcepath in extra-files.stamp * acinclude.m4: (AC_CHECK_ENABLE_NIMBUS): New macro. * configure.ac: Enable --disable-nimbus, only search for JIBX and dependencies when enabled. diffstat: 4 files changed, 59 insertions(+), 18 deletions(-) ChangeLog | 11 +++++++++++ Makefile.am | 38 +++++++++++++++++++++++--------------- acinclude.m4 | 17 +++++++++++++++++ configure.ac | 11 ++++++++--- diffs (166 lines): diff -r 9f5cce422771 -r 2a131daaa86d ChangeLog --- a/ChangeLog Thu May 14 14:08:42 2009 +0100 +++ b/ChangeLog Thu May 14 21:25:31 2009 +0100 @@ -1,3 +1,14 @@ 2009-05-14 Andrew John Hughes + + * Makefile.am: + Add support for DISABLE_NIMBUS, correct + use of bootclasspath/sourcepath in extra-files.stamp + * acinclude.m4: + (AC_CHECK_ENABLE_NIMBUS): New macro. + * configure.ac: + Enable --disable-nimbus, only search for JIBX + and dependencies when enabled. + 2009-05-14 Andrew John Hughes * Makefile.am: diff -r 9f5cce422771 -r 2a131daaa86d Makefile.am --- a/Makefile.am Thu May 14 14:08:42 2009 +0100 +++ b/Makefile.am Thu May 14 21:25:31 2009 +0100 @@ -1446,11 +1446,16 @@ ICEDTEA_ENV = \ "JAVAC=" \ "RHINO_JAR=$(RHINO_JAR)" \ "DISTRIBUTION_ID=$(DIST_ID)" \ - "ALT_JIBX_LIBS_PATH=$(abs_top_builddir)/jibx" + "ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" if WITH_CACAO ICEDTEA_ENV += \ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)" +endif + +if !ENABLE_NIMBUS +ICEDTEA_ENV += \ + "DISABLE_NIMBUS=true" endif if !ENABLE_OPTIMIZATIONS @@ -1524,7 +1529,7 @@ ICEDTEA_ENV_ECJ = \ "JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \ "JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \ "JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)" \ - "ALT_JIBX_LIBS_PATH=$(abs_top_builddir)/jibx" + "DISABLE_NIMBUS=true" if WITH_CACAO ICEDTEA_ENV_ECJ += \ @@ -2881,13 +2886,13 @@ stamps/rt-class-files.stamp: rt-source-f $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \ -source 1.5 \ -sourcepath \ - '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \ + '$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \ -bootclasspath \'\' @$< ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \ -source 1.5 \ -sourcepath \ - '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \ + '$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \ -bootclasspath \'\' @$< ; \ fi mkdir -p stamps @@ -2926,16 +2931,16 @@ stamps/extra-class-files.stamp: extra-so then \ $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \ -source 1.5 \ - -sourcepath $(abs_top_srcdir)/extra \ - -bootclasspath \ - '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \ + -sourcepath \ + $(abs_top_srcdir)/extra:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \ + -bootclasspath \'\' \ @extra-source-files.txt ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \ -source 1.5 \ - -sourcepath $(abs_top_srcdir)/extra \ - -bootclasspath \ - '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \ + -sourcepath \ + $(abs_top_srcdir)/extra:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \ + -bootclasspath \'\' \ @extra-source-files.txt ; \ fi cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \ @@ -2959,11 +2964,14 @@ extra-lib/about.jar: stamps/extra-class- fi stamps/jibx.stamp: extra-lib/about.jar - mkdir $(abs_top_builddir)/jibx - ln -s $(BCEL_JAR) $(abs_top_builddir)/jibx - ln -s $(XPP3_JAR) $(abs_top_builddir)/jibx - ln -s $(JIBX_DIR)/jibx-bind.jar $(abs_top_builddir)/jibx - ln -s $(JIBX_DIR)/jibx-run.jar $(abs_top_builddir)/jibx +if ENABLE_NIMBUS + JIBX_DEPS_DIR=$(abs_top_builddir)/jibx + mkdir $(JIBX_DEPS_DIR) + ln -s $(BCEL_JAR) $(JIBX_DEPS_DIR) + ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR) + ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR) + ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR) +endif mkdir -p stamps touch $@ diff -r 9f5cce422771 -r 2a131daaa86d acinclude.m4 --- a/acinclude.m4 Thu May 14 14:08:42 2009 +0100 +++ b/acinclude.m4 Thu May 14 21:25:31 2009 +0100 @@ -1420,3 +1420,20 @@ AC_DEFUN([FIND_JIBX_DIR], AC_MSG_RESULT(${JIBX_DIR}) AC_SUBST(JIBX_DIR) ]) + +AC_DEFUN([AC_CHECK_ENABLE_NIMBUS], +[ + AC_MSG_CHECKING(whether to build the Nimbus L'n'F) + AC_ARG_ENABLE([nimbus], + [AS_HELP_STRING(--enable-nimbus,build the Nimbus L'n'F [[default=yes]])], + [ + ENABLE_NIMBUS="${enableval}" + ], + [ + ENABLE_NIMBUS=yes + ]) + + AC_MSG_RESULT(${ENABLE_NIMBUS}) + AM_CONDITIONAL(ENABLE_NIMBUS, test x"${ENABLE_NIMBUS}" = "xyes") + AC_SUBST(ENABLE_NIMBUS) +]) diff -r 9f5cce422771 -r 2a131daaa86d configure.ac --- a/configure.ac Thu May 14 14:08:42 2009 +0100 +++ b/configure.ac Thu May 14 21:25:31 2009 +0100 @@ -271,9 +271,6 @@ fi fi IT_CP39408_JAVAH FIND_RHINO_JAR -FIND_BCEL_JAR -FIND_XPP3_JAR -FIND_JIBX_DIR WITH_OPENJDK_SRC_ZIP WITH_HOTSPOT_SRC_ZIP WITH_CORBA_SRC_ZIP @@ -286,6 +283,7 @@ AC_CHECK_ENABLE_CACAO AC_CHECK_ENABLE_CACAO AC_CHECK_WITH_CACAO_HOME AC_CHECK_WITH_CACAO_SRC_ZIP +AC_CHECK_ENABLE_NIMBUS ENABLE_OPTIMIZATIONS SET_SHARK_BUILD ENABLE_ZERO_BUILD @@ -318,6 +316,13 @@ if test "x${enable_pulse_java}" = "xyes" if test "x${enable_pulse_java}" = "xyes" then FIND_PULSEAUDIO +fi + +if test "x${ENABLE_NIMBUS}" = "xyes" +then +FIND_BCEL_JAR +FIND_XPP3_JAR +FIND_JIBX_DIR fi dnl pkgconfig cannot be used to find these headers and libraries. From ahughes at redhat.com Mon May 18 18:31:27 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 19 May 2009 01:31:27 +0000 Subject: changeset in /hg/icedtea: Support providing the Nimbus dependenc... Message-ID: changeset 9f5cce422771 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9f5cce422771 description: Support providing the Nimbus dependencies (JIBX, BCEL and XPP3) 2009-05-14 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Added back. (ALT_JIBX_LIBS_PATH): Point to our jibx directory. (extra.stamp): Use OpenJDK source files rather than (possibly non-existant) rt.jar. (jibx.stamp): Add symlinks to JIBX JAR files. * acinclude.m4: (FIND_BCEL_JAR): New macro. (FIND_XPP3_JAR): Likewise. (FIND_JIBX_DIR): Likewise. * configure.ac: Include new macros for finding Nimbus dependencies. diffstat: 4 files changed, 155 insertions(+), 9 deletions(-) ChangeLog | 16 ++++++++ Makefile.am | 37 +++++++++++++++---- acinclude.m4 | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 3 + diffs (254 lines): diff -r a2d7e774507e -r 9f5cce422771 ChangeLog --- a/ChangeLog Thu May 14 10:32:51 2009 +0100 +++ b/ChangeLog Thu May 14 14:08:42 2009 +0100 @@ -1,3 +1,19 @@ 2009-05-14 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Added back. + (ALT_JIBX_LIBS_PATH): Point to our jibx + directory. + (extra.stamp): Use OpenJDK source files + rather than (possibly non-existant) rt.jar. + (jibx.stamp): Add symlinks to JIBX JAR files. + * acinclude.m4: + (FIND_BCEL_JAR): New macro. + (FIND_XPP3_JAR): Likewise. + (FIND_JIBX_DIR): Likewise. + * configure.ac: + Include new macros for finding Nimbus dependencies. + 2009-05-14 Andrew John Hughes * Makefile.am: diff -r a2d7e774507e -r 9f5cce422771 Makefile.am --- a/Makefile.am Thu May 14 10:32:51 2009 +0100 +++ b/Makefile.am Thu May 14 14:08:42 2009 +0100 @@ -1,3 +1,5 @@ OPENJDK_CHANGESET = 4264c2fe6649 +OPENJDK_VERSION = b58 + OPENJDK_CHANGESET = 4264c2fe6649 CORBA_CHANGESET = 61116c9789b9 JAXP_CHANGESET = ae890d80d5df @@ -1443,7 +1445,8 @@ ICEDTEA_ENV = \ "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \ "JAVAC=" \ "RHINO_JAR=$(RHINO_JAR)" \ - "DISTRIBUTION_ID=$(DIST_ID)" + "DISTRIBUTION_ID=$(DIST_ID)" \ + "ALT_JIBX_LIBS_PATH=$(abs_top_builddir)/jibx" if WITH_CACAO ICEDTEA_ENV += \ @@ -1520,7 +1523,8 @@ 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)" \ + "ALT_JIBX_LIBS_PATH=$(abs_top_builddir)/jibx" if WITH_CACAO ICEDTEA_ENV_ECJ += \ @@ -2533,7 +2537,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(ICEDTEAPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \ + $(ICEDTEAPLUGIN_TARGET) stamps/jibx.stamp stamps/cacao.stamp \ stamps/pulse-java.stamp stamps/visualvm.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ @@ -2592,7 +2596,7 @@ stamps/icedtea-debug.stamp: stamps/boots stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(ICEDTEAPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \ + $(ICEDTEAPLUGIN_TARGET) stamps/jibx.stamp stamps/cacao.stamp \ stamps/pulse-java.stamp stamps/visualvm.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ @@ -2675,7 +2679,7 @@ endif touch stamps/native-ecj.stamp stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ - stamps/hotspot-tools.stamp stamps/plugs.stamp \ + stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/jibx.stamp \ stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ @@ -2922,13 +2926,17 @@ stamps/extra-class-files.stamp: extra-so then \ $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \ -source 1.5 \ - -sourcepath extra -cp $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar \ - -bootclasspath \'\' @extra-source-files.txt ; \ + -sourcepath $(abs_top_srcdir)/extra \ + -bootclasspath \ + '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \ + @extra-source-files.txt ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \ -source 1.5 \ - -sourcepath extra -cp $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar \ - -bootclasspath \'\' @extra-source-files.txt ; \ + -sourcepath $(abs_top_srcdir)/extra \ + -bootclasspath \ + '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \ + @extra-source-files.txt ; \ fi cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \ extra-lib/net/sourceforge/jnlp/about @@ -2949,6 +2957,15 @@ extra-lib/about.jar: stamps/extra-class- else \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \ fi + +stamps/jibx.stamp: extra-lib/about.jar + mkdir $(abs_top_builddir)/jibx + ln -s $(BCEL_JAR) $(abs_top_builddir)/jibx + ln -s $(XPP3_JAR) $(abs_top_builddir)/jibx + ln -s $(JIBX_DIR)/jibx-bind.jar $(abs_top_builddir)/jibx + ln -s $(JIBX_DIR)/jibx-run.jar $(abs_top_builddir)/jibx + mkdir -p stamps + touch $@ stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp if WITH_CACAO @@ -3303,6 +3320,8 @@ icedtea-debug: stamps/icedtea-debug.stam icedtea-ecj: stamps/icedtea-ecj.stamp +jibx: stamps/jibx.stamp + native-ecj: stamps/native-ecj.stamp patch-ecj: stamps/patch-ecj.stamp diff -r a2d7e774507e -r 9f5cce422771 acinclude.m4 --- a/acinclude.m4 Thu May 14 10:32:51 2009 +0100 +++ b/acinclude.m4 Thu May 14 14:08:42 2009 +0100 @@ -1312,3 +1312,111 @@ AM_CONDITIONAL([CP39408_JAVAH], test x"$ AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes") AC_PROVIDE([$0])dnl ]) + +AC_DEFUN([FIND_BCEL_JAR], +[ + AC_MSG_CHECKING([for bytecode engineering library (BCEL)]) + AC_ARG_WITH([bcel], + [AS_HELP_STRING(--with-bcel,specify location of the bcel jar)], + [ + case "${withval}" in + yes) + BCEL_JAR=yes + ;; + no) + BCEL_JAR=no + ;; + *) + BCEL_JAR="${withval}" + ;; + esac + ], + [ + BCEL_JAR=yes + ]) + if test x"${BCEL_JAR}" = "xyes"; then + if test -e "/usr/share/bcel/lib/bcel.jar"; then + BCEL_JAR="/usr/share/bcel/lib/bcel.jar" + elif test -e "/usr/share/java/bcel.jar"; then + BCEL_JAR="/usr/share/java/bcel.jar" + fi + fi + if ! test -f "${BCEL_JAR}"; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR("A BCEL jar ${BCEL_JAR} was not found.") + fi + AC_MSG_RESULT(${BCEL_JAR}) + AC_SUBST(BCEL_JAR) +]) + +AC_DEFUN([FIND_XPP3_JAR], +[ + AC_MSG_CHECKING([for XML Pull Parser 3 (XPP3)]) + AC_ARG_WITH([xpp3], + [AS_HELP_STRING(--with-xpp3,specify location of the xpp3 jar)], + [ + case "${withval}" in + yes) + XPP3_JAR=yes + ;; + no) + XPP3_JAR=no + ;; + *) + XPP3_JAR="${withval}" + ;; + esac + ], + [ + XPP3_JAR=yes + ]) + if test x"${XPP3_JAR}" = "xyes"; then + if test -e "/usr/share/xpp3/lib/xpp3.jar"; then + XPP3_JAR="/usr/share/xpp3/lib/xpp3.jar" + elif test -e "/usr/share/java/xpp3.jar"; then + XPP3_JAR="/usr/share/java/xpp3.jar" + fi + fi + if ! test -f "${XPP3_JAR}"; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR("A XPP3 jar ${XPP3_JAR} was not found.") + fi + AC_MSG_RESULT(${XPP3_JAR}) + AC_SUBST(XPP3_JAR) +]) + +AC_DEFUN([FIND_JIBX_DIR], +[ + AC_MSG_CHECKING([for JIBX]) + AC_ARG_WITH([jibx], + [AS_HELP_STRING(--with-jibx,specify location of the jibx jars)], + [ + case "${withval}" in + yes) + JIBX_DIR=yes + ;; + no) + JIBX_DIR=no + ;; + *) + JIBX_DIR="${withval}" + ;; + esac + ], + [ + JIBX_DIR=yes + ]) + if test x"${JIBX_DIR}" = "xyes"; then + if test -e "/usr/share/jibx/lib/jibx-run.jar"; then + JIBX_DIR=/usr/share/jibx/lib + elif test -e "/usr/share/java/jibx-run.jar"; then + JIBX_DIR=/usr/share/java + fi + fi + if ! test -d "${JIBX_DIR}"; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR("A JIBX jar directory ${JIBX_JAR} was not found.") + fi + AC_MSG_RESULT(${JIBX_DIR}) + AC_SUBST(JIBX_DIR) +]) diff -r a2d7e774507e -r 9f5cce422771 configure.ac --- a/configure.ac Thu May 14 10:32:51 2009 +0100 +++ b/configure.ac Thu May 14 14:08:42 2009 +0100 @@ -271,6 +271,9 @@ fi fi IT_CP39408_JAVAH FIND_RHINO_JAR +FIND_BCEL_JAR +FIND_XPP3_JAR +FIND_JIBX_DIR WITH_OPENJDK_SRC_ZIP WITH_HOTSPOT_SRC_ZIP WITH_CORBA_SRC_ZIP From ahughes at redhat.com Mon May 18 18:31:29 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 19 May 2009 01:31:29 +0000 Subject: changeset in /hg/icedtea: Fix issues with ecj build and make ful... Message-ID: changeset 44972a4d3e90 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=44972a4d3e90 description: Fix issues with ecj build and make full bootstrap the default again. 2009-05-19 Andrew John Hughes * HACKING: Updated with new ecj patches. * Makefile.am: Move JIBX_DEPS_DIR definition to top level, remove jibx.stamp from ecj build. * acinclude.m4: (IT_JAVAH): Renamed from IT_CP39408_JAVAH. Add test for PR40188. * configure.ac: Make full bootstrap the default again. Rename IT_CP39408_JAVAH to IT_JAVAH. * patches/ecj/icedtea-dyn.patch: New patch to disable building of java.dyn when using ecj (needs javac 1.7). * patches/ecj/icedtea-pr40188.patch: New patch for when bug PR40188 is present in javah (incorrect naming of constants). diffstat: 7 files changed, 74 insertions(+), 8 deletions(-) ChangeLog | 18 ++++++++++++++++++ HACKING | 3 +++ Makefile.am | 16 ++++++++++++---- acinclude.m4 | 14 ++++++++++++-- configure.ac | 4 ++-- patches/ecj/icedtea-dyn.patch | 12 ++++++++++++ patches/ecj/icedtea-pr40188.patch | 15 +++++++++++++++ diffs (183 lines): diff -r 58c1bf70c801 -r 44972a4d3e90 ChangeLog --- a/ChangeLog Thu May 14 21:27:31 2009 +0100 +++ b/ChangeLog Tue May 19 00:20:40 2009 +0100 @@ -1,3 +1,21 @@ 2009-05-14 Andrew John Hughes + + * HACKING: Updated with new ecj patches. + * Makefile.am: Move JIBX_DEPS_DIR definition + to top level, remove jibx.stamp from ecj build. + * acinclude.m4: + (IT_JAVAH): Renamed from IT_CP39408_JAVAH. + Add test for PR40188. + * configure.ac: + Make full bootstrap the default again. Rename + IT_CP39408_JAVAH to IT_JAVAH. + * patches/ecj/icedtea-dyn.patch: + New patch to disable building of java.dyn + when using ecj (needs javac 1.7). + * patches/ecj/icedtea-pr40188.patch: + New patch for when bug PR40188 is present + in javah (incorrect naming of constants). + 2009-05-14 Andrew John Hughes * configure.ac: diff -r 58c1bf70c801 -r 44972a4d3e90 HACKING --- a/HACKING Thu May 14 21:27:31 2009 +0100 +++ b/HACKING Tue May 19 00:20:40 2009 +0100 @@ -121,6 +121,9 @@ The following patches are only applied t The following patches are only applied to the icedtea-ecj bootstrap tree in IcedTea: +* ecj/icedtea-dyn.patch: Don't build java.dyn (needs javac 1.7) +* ecj/icedtea-pr39408.patch: Add missing constants from superclass not generated by gjavah +* ecj/icedtea-pr40188.patch: Fix names to refer to constants generated by gjavah. * ecj/icedtea-sbcs.patch: Fixes GenerateSBCS.java to not use java.util.Scanner. The following patches are only applied for IcedTea builds using the zero-assembler: diff -r 58c1bf70c801 -r 44972a4d3e90 Makefile.am --- a/Makefile.am Thu May 14 21:27:31 2009 +0100 +++ b/Makefile.am Tue May 19 00:20:40 2009 +0100 @@ -47,6 +47,10 @@ PULSE_JAVA_NATIVE_BUILDDIR = PULSE_JAVA_NATIVE_BUILDDIR = PULSE_JAVA_JAVA_SRCDIR = PULSE_JAVA_CLASS_DIR = +endif + +if ENABLE_NIMBUS +JIBX_DEPS_DIR=$(abs_top_builddir)/jibx endif # Top-Level Targets @@ -2338,15 +2342,20 @@ stamps/ports-ecj.stamp: stamps/clone-ecj mkdir -p stamps touch stamps/ports-ecj.stamp -# Patch OpenJDK for plug replacements and ecj. +# Patch OpenJDK for ecj/gcj builds. ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \ patches/ecj/icedtea-hotspot-$(HSBUILD).patch \ patches/ecj/icedtea-spp.patch \ patches/ecj/icedtea-jopt.patch \ - patches/ecj/icedtea-sbcs.patch + patches/ecj/icedtea-sbcs.patch \ + patches/ecj/icedtea-dyn.patch if CP39408_JAVAH ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr39408.patch +endif + +if CP40188_JAVAH +ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr40188.patch endif stamps/patch-ecj.stamp: stamps/clone-ecj.stamp @@ -2684,7 +2693,7 @@ endif touch stamps/native-ecj.stamp stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ - stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/jibx.stamp \ + stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ @@ -2965,7 +2974,6 @@ extra-lib/about.jar: stamps/extra-class- stamps/jibx.stamp: extra-lib/about.jar if ENABLE_NIMBUS - JIBX_DEPS_DIR=$(abs_top_builddir)/jibx mkdir $(JIBX_DEPS_DIR) ln -s $(BCEL_JAR) $(JIBX_DEPS_DIR) ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR) diff -r 58c1bf70c801 -r 44972a4d3e90 acinclude.m4 --- a/acinclude.m4 Thu May 14 21:27:31 2009 +0100 +++ b/acinclude.m4 Tue May 19 00:20:40 2009 +0100 @@ -1264,7 +1264,7 @@ AC_DEFUN([AC_CHECK_FOR_ICEDTEA], AC_SUBST(SYSTEM_ICEDTEA_DIR) ]) -AC_DEFUN([IT_CP39408_JAVAH],[ +AC_DEFUN([IT_JAVAH],[ AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [ SUPERCLASS=Test.java SUBCLASS=TestImpl.java @@ -1305,11 +1305,21 @@ else echo "configure: failed program was:" >&AC_FD_CC cat $SUBCLASS >&AC_FD_CC fi +]) +AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 40188], it_cv_cp40188_javah, [ + if test -e $SUBHEADER ; then + if cat $SUBHEADER | grep TestImpl_POTATO > /dev/null 2>&1; then + it_cv_cp40188_javah=no; + else + it_cv_cp40188_javah=yes; + fi + fi +]) rm -f $SUBCLASS $SUPERCLASS $SUBHEADER *.class cd .. rmdir tmp.$$ -]) AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes") +AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes") AC_PROVIDE([$0])dnl ]) diff -r 58c1bf70c801 -r 44972a4d3e90 configure.ac --- a/configure.ac Thu May 14 21:27:31 2009 +0100 +++ b/configure.ac Tue May 19 00:20:40 2009 +0100 @@ -50,7 +50,7 @@ AC_ARG_WITH([icedtea], fi ], [ - with_icedtea=true + with_icedtea=false ]) AM_CONDITIONAL(WITH_ICEDTEA, test "${with_icedtea}" = true) AC_MSG_RESULT(${with_icedtea}) @@ -269,7 +269,7 @@ else AC_CONFIG_FILES([javap], [chmod +x javap]) fi fi -IT_CP39408_JAVAH +IT_JAVAH FIND_RHINO_JAR WITH_OPENJDK_SRC_ZIP WITH_HOTSPOT_SRC_ZIP diff -r 58c1bf70c801 -r 44972a4d3e90 patches/ecj/icedtea-dyn.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/icedtea-dyn.patch Tue May 19 00:20:40 2009 +0100 @@ -0,0 +1,12 @@ +diff -Nru openjdk-ecj.orig/jdk/make/java/Makefile openjdk-ecj/jdk/make/java/Makefile +--- openjdk-ecj.orig/jdk/make/java/Makefile 2009-05-12 15:54:22.000000000 +0100 ++++ openjdk-ecj/jdk/make/java/Makefile 2009-05-18 20:54:22.000000000 +0100 +@@ -39,7 +39,7 @@ + # Others + # Note: java_crw_demo java_hprof_demo are demos but must be delivered built in sdk + SUBDIRS += security npt java_crw_demo java_hprof_demo \ +- math awt util text applet net nio dyn \ ++ math awt util text applet net nio \ + sql rmi jar beans logging management instrument + + diff -r 58c1bf70c801 -r 44972a4d3e90 patches/ecj/icedtea-pr40188.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/icedtea-pr40188.patch Tue May 19 00:20:40 2009 +0100 @@ -0,0 +1,15 @@ +diff -Nru openjdk-ecj.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c openjdk-ecj/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c +--- openjdk-ecj.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-03-30 17:23:08.000000000 +0100 ++++ openjdk-ecj/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-05-18 19:58:36.000000000 +0100 +@@ -192,9 +192,9 @@ + lockResult = fcntl(fd, cmd, &fl); + if (lockResult < 0) { + if ((cmd == F_SETLK64) && (errno == EAGAIN)) +- return sun_nio_ch_FileDispatcherImpl_NO_LOCK; ++ return sun_nio_ch_FileDispatcher_NO_LOCK; + if (errno == EINTR) +- return sun_nio_ch_FileDispatcherImpl_INTERRUPTED; ++ return sun_nio_ch_FileDispatcher_INTERRUPTED; + JNU_ThrowIOExceptionWithLastError(env, "Lock failed"); + } + return 0; From ahughes at redhat.com Mon May 18 18:31:29 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 19 May 2009 01:31:29 +0000 Subject: changeset in /hg/icedtea: Bump build number and changesets/md5sums. Message-ID: changeset 8cf23c220172 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8cf23c220172 description: Bump build number and changesets/md5sums. 2009-05-19 Andrew John Hughes * Makefile.am: Update build to b59 and changesets/md5sums to current IcedTea forest tip. diffstat: 2 files changed, 23 insertions(+), 17 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 34 +++++++++++++++++----------------- diffs (54 lines): diff -r 44972a4d3e90 -r 8cf23c220172 ChangeLog --- a/ChangeLog Tue May 19 00:20:40 2009 +0100 +++ b/ChangeLog Tue May 19 02:32:56 2009 +0100 @@ -1,3 +1,9 @@ 2009-05-19 Andrew John Hughes + + * Makefile.am: + Update build to b59 and changesets/md5sums + to current IcedTea forest tip. + 2009-05-19 Andrew John Hughes * HACKING: Updated with new ecj patches. diff -r 44972a4d3e90 -r 8cf23c220172 Makefile.am --- a/Makefile.am Tue May 19 00:20:40 2009 +0100 +++ b/Makefile.am Tue May 19 02:32:56 2009 +0100 @@ -1,20 +1,20 @@ OPENJDK_VERSION = b58 -OPENJDK_VERSION = b58 - -OPENJDK_CHANGESET = 4264c2fe6649 -CORBA_CHANGESET = 61116c9789b9 -JAXP_CHANGESET = ae890d80d5df -JAXWS_CHANGESET = 41a66a42791b -JDK_CHANGESET = 111759f6793e -LANGTOOLS_CHANGESET = 2c0076945b1a -HOTSPOT_CHANGESET = ce2272390558 - -OPENJDK_MD5SUM = 5a8079dc55a46ae3750fdf7ca0ac0c7e -CORBA_MD5SUM = f4cad920654b2e26cb10096ef36a6fbd -JAXP_MD5SUM = 3356a4449fffd71c19aaae98deb04e88 -JAXWS_MD5SUM = c45f0c75b7c2a0091f697e0c83f85e3f -JDK_MD5SUM = 23b1790a8ca14c91cbed0b5843027d54 -LANGTOOLS_MD5SUM = 51735120c48db8ccaf11296ab5b73c5e -HOTSPOT_MD5SUM = 94f6a0f2ccf1b79b0950f6f74a73214e +OPENJDK_VERSION = b59 + +OPENJDK_CHANGESET = 0d76c4da605f +CORBA_CHANGESET = e9ba2b962ddf +JAXP_CHANGESET = 748976d69503 +JAXWS_CHANGESET = faac46e2e60f +JDK_CHANGESET = 2dd6aaa32d8a +LANGTOOLS_CHANGESET = 0f653be1a42f +HOTSPOT_CHANGESET = aa0c48844632 + +OPENJDK_MD5SUM = 51beb96e5d6bc4b875b4316f4ef724d7 +CORBA_MD5SUM = 13b64a402845a469cae31e04ffc5ee80 +JAXP_MD5SUM = 18c922319545d7e907a2d6cbb265865d +JAXWS_MD5SUM = b2c0a779e349f82427a78485ef53321b +JDK_MD5SUM = 93af337ffa87c10c2b90e0938fedf3ee +LANGTOOLS_MD5SUM = ccad721f71ab49a61bbf684039b4d55d +HOTSPOT_MD5SUM = c40c25a481a1c33ac15a89812a0b9f8c CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa From langel at redhat.com Mon May 18 18:46:23 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 18 May 2009 21:46:23 -0400 Subject: changeset in /hg/icedtea6: 2009-05-17 Matthias Klose References: Message-ID: <4A120F6F.8080609@redhat.com> doko at ubuntu.com wrote: > changeset 2855ab5fe0e7 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2855ab5fe0e7 > description: > 2009-05-17 Matthias Klose > > Revert patch breaking build using gcj: > Ouch. My apologies for this. Thanks for catching it. > 2009-05-15 Lillian Angel > * Makefile.am > (ICEDTEA_PATCHES): patches/icedtea-tools.patch and > patches/icedtea-javafiles.patch removed from list. > * patches/icedtea-tools.patch, > patches/icedtea-javafiles.patch: Removed. > * HACKING: Updated. > > diffstat: > > 5 files changed, 256 insertions(+), 2 deletions(-) > ChangeLog | 12 ++ > HACKING | 4 > Makefile.am | 2 > patches/icedtea-javafiles.patch | 157 +++++++++++++++++++++++++++++++++++++++ > patches/icedtea-tools.patch | 83 ++++++++++++++++++++ > > diffs (311 lines): > > diff -r 408be9d00bfe -r 2855ab5fe0e7 ChangeLog > --- a/ChangeLog Fri May 15 16:35:35 2009 -0400 > +++ b/ChangeLog Sun May 17 22:34:16 2009 +0200 > @@ -1,3 +1,15 @@ 2009-05-15 Deepak Bhole +2009-05-17 Matthias Klose > + > + Revert patch breaking build using gcj: > + > + 2009-05-15 Lillian Angel > + * Makefile.am > + (ICEDTEA_PATCHES): patches/icedtea-tools.patch and > + patches/icedtea-javafiles.patch removed from list. > + * patches/icedtea-tools.patch, > + patches/icedtea-javafiles.patch: Removed. > + * HACKING: Updated. > + > 2009-05-15 Deepak Bhole > > * Makefile.am: Wire in new plugin build. > diff -r 408be9d00bfe -r 2855ab5fe0e7 HACKING > --- a/HACKING Fri May 15 16:35:35 2009 -0400 > +++ b/HACKING Sun May 17 22:34:16 2009 +0200 > @@ -30,6 +30,7 @@ The following patches are currently appl > * icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649) > * icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64. > * icedtea-javac-debuginfo.patch: Ensure debugging information is generated for all class files. > +* icedtea-javafiles.patch: Add missing Java files to list. > * icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support. > * icedtea-lcms: Applies security patch. > * icedtea-lcms-2.patch: Temporary fix for https://bugs.openjdk.java.net/show_bug.cgi?id=100050. > @@ -50,6 +51,7 @@ The following patches are currently appl > * icedtea-sunsrc.patch: Remove service property files from TOOLS list. > * icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms. > * icedtea-timerqueue.patch: Fix setting of running variable (PR87). > +* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti. > * icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486). > * icedtea-version.patch: Replace name and bug URL with IcedTea versions. > * icedtea-webservices.patch: Add applet support. > @@ -162,5 +164,3 @@ changes to the OpenJDK code base and/or > * icedtea-core-zero-build.patch: Not required with HS14. > * icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14. > * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. Not required with HS14. > -* icedtea-javafiles.patch: Add missing Java files to list. > -* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti. > diff -r 408be9d00bfe -r 2855ab5fe0e7 Makefile.am > --- a/Makefile.am Fri May 15 16:35:35 2009 -0400 > +++ b/Makefile.am Sun May 17 22:34:16 2009 +0200 > @@ -507,6 +507,7 @@ ICEDTEA_PATCHES = \ > patches/icedtea-webstart.patch \ > patches/icedtea-webstart-umask.patch \ > patches/icedtea-rmi_amd64.patch \ > + patches/icedtea-tools.patch \ > patches/icedtea-demos.patch \ > patches/icedtea-timezone.patch \ > patches/icedtea-use-system-tzdata.patch \ > @@ -520,6 +521,7 @@ ICEDTEA_PATCHES = \ > patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ > patches/icedtea-sunsrc.patch \ > patches/icedtea-libraries.patch \ > + patches/icedtea-javafiles.patch \ > patches/icedtea-core-build.patch \ > patches/icedtea-jvmtiEnv.patch \ > patches/icedtea-lcms.patch \ > diff -r 408be9d00bfe -r 2855ab5fe0e7 patches/icedtea-javafiles.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/icedtea-javafiles.patch Sun May 17 22:34:16 2009 +0200 > @@ -0,0 +1,157 @@ > +--- openjdk/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200 > ++++ openjdk/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200 > +@@ -29,6 +29,80 @@ > + # will generate header files > + # > + JAVA_JAVA_java = \ > ++ java/lang/reflect/AccessibleObject.java \ > ++ java/lang/reflect/AnnotatedElement.java \ > ++ java/lang/reflect/Array.java \ > ++ java/lang/reflect/Constructor.java \ > ++ java/lang/reflect/Field.java \ > ++ java/lang/reflect/GenericArrayType.java \ > ++ java/lang/reflect/GenericDeclaration.java \ > ++ java/lang/reflect/GenericSignatureFormatError.java \ > ++ java/lang/reflect/InvocationHandler.java \ > ++ java/lang/reflect/InvocationTargetException.java \ > ++ java/lang/reflect/MalformedParameterizedTypeException.java \ > ++ java/lang/reflect/Member.java \ > ++ java/lang/reflect/Method.java \ > ++ java/lang/reflect/Modifier.java \ > ++ java/lang/reflect/package-info.java \ > ++ java/lang/reflect/ParameterizedType.java \ > ++ java/lang/reflect/Proxy.java \ > ++ java/lang/reflect/ReflectAccess.java \ > ++ java/lang/reflect/ReflectPermission.java \ > ++ java/lang/reflect/Type.java \ > ++ java/lang/reflect/TypeVariable.java \ > ++ java/lang/reflect/UndeclaredThrowableException.java \ > ++ java/lang/reflect/WildcardType.java \ > ++ java/lang/ref/Finalizer.java \ > ++ java/lang/ref/FinalReference.java \ > ++ java/lang/ref/PhantomReference.java \ > ++ java/lang/ref/Reference.java \ > ++ java/lang/ref/ReferenceQueue.java \ > ++ java/lang/ref/SoftReference.java \ > ++ java/lang/ref/WeakReference.java \ > ++ java/lang/management/ClassLoadingMXBean.java \ > ++ java/lang/management/CompilationMXBean.java \ > ++ java/lang/management/GarbageCollectorMXBean.java \ > ++ java/lang/management/LockInfo.java \ > ++ java/lang/management/ManagementFactory.java \ > ++ java/lang/management/ManagementPermission.java \ > ++ java/lang/management/MemoryManagerMXBean.java \ > ++ java/lang/management/MemoryMXBean.java \ > ++ java/lang/management/MemoryNotificationInfo.java \ > ++ java/lang/management/MemoryPoolMXBean.java \ > ++ java/lang/management/MemoryType.java \ > ++ java/lang/management/MemoryUsage.java \ > ++ java/lang/management/MonitorInfo.java \ > ++ java/lang/management/OperatingSystemMXBean.java \ > ++ java/lang/management/RuntimeMXBean.java \ > ++ java/lang/management/ThreadInfo.java \ > ++ java/lang/management/ThreadMXBean.java \ > ++ java/lang/instrument/ClassDefinition.java \ > ++ java/lang/instrument/ClassFileTransformer.java \ > ++ java/lang/instrument/IllegalClassFormatException.java \ > ++ java/lang/instrument/Instrumentation.java \ > ++ java/lang/instrument/UnmodifiableClassException.java \ > ++ java/lang/annotation/AnnotationFormatError.java \ > ++ java/lang/annotation/Annotation.java \ > ++ java/lang/annotation/AnnotationTypeMismatchException.java \ > ++ java/lang/annotation/Documented.java \ > ++ java/lang/annotation/ElementType.java \ > ++ java/lang/annotation/IncompleteAnnotationException.java \ > ++ java/lang/annotation/Inherited.java \ > ++ java/lang/annotation/package-info.java \ > ++ java/lang/annotation/Retention.java \ > ++ java/lang/annotation/RetentionPolicy.java \ > ++ java/lang/annotation/Target.java \ > ++ java/io/IOError.java \ > ++ java/lang/Deprecated.java \ > ++ java/lang/Iterable.java \ > ++ java/util/RandomAccess.java \ > ++ java/lang/CharacterData00.java \ > ++ java/lang/CharacterData01.java \ > ++ java/lang/CharacterData02.java \ > ++ java/lang/CharacterData0E.java \ > ++ java/lang/CharacterDataLatin1.java \ > ++ java/lang/CharacterDataPrivateUse.java \ > ++ java/lang/CharacterDataUndefined.java \ > + java/lang/Object.java \ > + java/lang/Class.java \ > + java/lang/Thread.java \ > +@@ -135,13 +209,6 @@ > + java/lang/Readable.java \ > + java/lang/Override.java \ > + java/lang/SuppressWarnings.java \ > +- java/lang/ref/Reference.java \ > +- java/lang/ref/SoftReference.java \ > +- java/lang/ref/WeakReference.java \ > +- java/lang/ref/FinalReference.java \ > +- java/lang/ref/PhantomReference.java \ > +- java/lang/ref/ReferenceQueue.java \ > +- java/lang/ref/Finalizer.java \ > + java/util/BitSet.java \ > + java/util/Calendar.java \ > + java/util/GregorianCalendar.java \ > +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200 > ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200 > +@@ -62,7 +62,6 @@ > + com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \ > + com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \ > + com/sun/corba/se/impl/encoding/TypeCodeReader.java \ > +- com/sun/corba/se/impl/encoding/WrapperInputStream.java > +- > +- > +- > ++ com/sun/corba/se/impl/encoding/WrapperInputStream.java \ > ++ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ > ++ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java > +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200 > ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200 > +@@ -29,5 +29,6 @@ > + com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ > + com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ > + com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ > ++ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ > + com/sun/corba/se/spi/presentation/rmi/StubAdapter.java > + > +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200 > ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200 > +@@ -81,5 +81,5 @@ > + com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \ > + com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \ > + com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \ > +- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java > +- > ++ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \ > ++ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java > +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200 > ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200 > +@@ -30,6 +30,7 @@ > + com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \ > + com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \ > + com/sun/corba/se/spi/monitoring/MonitoringFactories.java \ > ++ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ > + com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \ > + com/sun/corba/se/spi/monitoring/MonitoredObject.java \ > + com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ > +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200 > ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200 > +@@ -66,4 +66,5 @@ > + com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ > + com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ > + com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ > +- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java > ++ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \ > ++ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java > +--- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200 > ++++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200 > +@@ -81,4 +81,5 @@ > + com/sun/corba/se/impl/orbutil/graph/Node.java \ > + com/sun/corba/se/impl/orbutil/graph/NodeData.java \ > + com/sun/corba/se/impl/orbutil/graph/Graph.java \ > +- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java > ++ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \ > ++ com/sun/corba/se/impl/orbutil/GetPropertyAction.java > diff -r 408be9d00bfe -r 2855ab5fe0e7 patches/icedtea-tools.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/icedtea-tools.patch Sun May 17 22:34:16 2009 +0200 > @@ -0,0 +1,83 @@ > +diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.linux openjdk/jdk/make/tools/sharing/classlist.linux > +--- openjdk-ecj/jdk/make/tools/sharing/classlist.linux 2007-08-30 03:19:44.000000000 -0400 > ++++ openjdk/jdk/make/tools/sharing/classlist.linux 2007-09-04 13:33:52.000000000 -0400 > +@@ -330,7 +330,6 @@ > + java/beans/PropertyChangeEvent > + java/util/EventObject > + java/awt/Component$AWTTreeLock > +-sun/awt/DebugHelper > + sun/awt/NativeLibLoader > + sun/security/action/LoadLibraryAction > + java/awt/GraphicsEnvironment > +@@ -341,7 +340,6 @@ > + java/lang/ProcessEnvironment$Value > + java/lang/ProcessEnvironment$StringEnvironment > + java/util/Collections$UnmodifiableMap > +-sun/awt/DebugHelperStub > + java/awt/Toolkit > + java/awt/Toolkit$3 > + sun/util/CoreResourceBundleControl > +diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.solaris openjdk/jdk/make/tools/sharing/classlist.solaris > +--- openjdk-ecj/jdk/make/tools/sharing/classlist.solaris 2007-08-30 03:19:44.000000000 -0400 > ++++ openjdk/jdk/make/tools/sharing/classlist.solaris 2007-09-04 13:34:17.000000000 -0400 > +@@ -332,7 +332,6 @@ > + java/beans/PropertyChangeEvent > + java/util/EventObject > + java/awt/Component$AWTTreeLock > +-sun/awt/DebugHelper > + sun/awt/NativeLibLoader > + sun/security/action/LoadLibraryAction > + java/awt/GraphicsEnvironment > +@@ -343,7 +342,6 @@ > + java/lang/ProcessEnvironment$Value > + java/lang/ProcessEnvironment$StringEnvironment > + java/util/Collections$UnmodifiableMap > +-sun/awt/DebugHelperStub > + java/awt/Toolkit > + java/awt/Toolkit$3 > + sun/util/CoreResourceBundleControl > +diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.windows openjdk/jdk/make/tools/sharing/classlist.windows > +--- openjdk-ecj/jdk/make/tools/sharing/classlist.windows 2007-08-30 03:19:44.000000000 -0400 > ++++ openjdk/jdk/make/tools/sharing/classlist.windows 2007-09-04 13:34:05.000000000 -0400 > +@@ -333,10 +333,8 @@ > + java/beans/PropertyChangeEvent > + java/util/EventObject > + java/awt/Component$AWTTreeLock > +-sun/awt/DebugHelper > + sun/awt/NativeLibLoader > + sun/security/action/LoadLibraryAction > +-sun/awt/DebugHelperStub > + java/awt/Toolkit > + java/awt/Toolkit$3 > + sun/util/CoreResourceBundleControl > +--- openjdk.orig/jdk/make/java/awt/Makefile 2008-02-28 04:39:42.000000000 -0500 > ++++ openjdk/jdk/make/java/awt/Makefile 2008-02-29 14:58:50.000000000 -0500 > +@@ -34,7 +34,7 @@ > + # > + AUTO_FILES_JAVA_DIRS = java/awt sun/awt/geom > + > +-build: properties cursors > ++build: sources properties cursors > + > + # > + # Resources > +@@ -47,9 +47,11 @@ > + # > + include $(BUILDDIR)/common/Classes.gmk > + > ++sources: > + > + clean:: properties.clean sun.geom.clean cursors.clean > + > ++ > + _LIBPROPS = \ > + flavormap.properties > + > +@@ -102,6 +104,6 @@ > + cursors.clean : > + $(RM) -r $(CURSORDIR) > + > +-.PHONY: properties properties.clean \ > ++.PHONY: sources properties properties.clean \ > + cursors sun.geom.clean cursors.clean > + > From langel at redhat.com Mon May 18 19:03:49 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 18 May 2009 22:03:49 -0400 Subject: Release tagging clarification Message-ID: <4A121385.4080604@redhat.com> Hi, There has been some confusion with regards to the tagging for the upcoming icedtea6-1.5 release. I usually tag the repo, and do all the testing based on that tag. Sometimes, testing fails and new commits need to be added under the current tag. I think it would be best for everyone if we started appending "rc1, rc2 ..." to the release tags until the testing is complete and everyone agrees that we can proceed with the release. I have renamed the current icedtea6-1.5 tag to "icedtea6-1.5rc1", and tagged the repo again as "icedtea6-1.5rc2". I am starting a new round of testing tonight on the current state of the repo. I will announce everytime I tag the repo for a new release candidate. Just because the repo was tagged, it did not mean the release was complete. This should resolve some confusion for the future. Cheers, Lillian diff -r 89b733da1bbe .hgtags --- a/.hgtags Mon May 18 15:20:03 2009 +0200 +++ b/.hgtags Mon May 18 22:02:48 2009 -0400 @@ -12,4 +12,4 @@ be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 -a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5 +a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 From langel at redhat.com Mon May 18 19:02:17 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 02:02:17 +0000 Subject: changeset in /hg/icedtea6: 2009-05-17 Lillian Angel changeset 80767dca269a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=80767dca269a description: 2009-05-17 Lillian Angel * .hgtags: Renamed icedtea6-1.5 tag to icedtea6-1.5rc1. diffstat: 2 files changed, 5 insertions(+), 1 deletion(-) .hgtags | 2 +- ChangeLog | 4 ++++ diffs (20 lines): diff -r 89b733da1bbe -r 80767dca269a .hgtags --- a/.hgtags Mon May 18 15:20:03 2009 +0200 +++ b/.hgtags Mon May 18 22:03:15 2009 -0400 @@ -12,4 +12,4 @@ be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 -a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5 +a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 diff -r 89b733da1bbe -r 80767dca269a ChangeLog --- a/ChangeLog Mon May 18 15:20:03 2009 +0200 +++ b/ChangeLog Mon May 18 22:03:15 2009 -0400 @@ -1,3 +1,7 @@ 2009-05-17 Robert Schuster + + * .hgtags: Renamed icedtea6-1.5 tag to icedtea6-1.5rc1. + 2009-05-17 Robert Schuster * Makefile.am: Introduce CROSS_COMPILATION variable to icedtea-ecj From langel at redhat.com Mon May 18 19:04:30 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 02:04:30 +0000 Subject: changeset in /hg/icedtea6: 2009-05-17 Lillian Angel changeset c2e865e1be29 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c2e865e1be29 description: 2009-05-17 Lillian Angel * NEWS: Updated. Added note about gcjwebplugin removal and Gervill fixes. diffstat: 2 files changed, 7 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ NEWS | 3 ++- diffs (27 lines): diff -r 80767dca269a -r c2e865e1be29 ChangeLog --- a/ChangeLog Mon May 18 22:03:15 2009 -0400 +++ b/ChangeLog Mon May 18 22:05:33 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-17 Lillian Angel + + * NEWS: Updated. Added note about gcjwebplugin removal and Gervill + fixes. + 2009-05-17 Lillian Angel * .hgtags: Renamed icedtea6-1.5 tag to icedtea6-1.5rc1. diff -r 80767dca269a -r c2e865e1be29 NEWS --- a/NEWS Mon May 18 22:03:15 2009 -0400 +++ b/NEWS Mon May 18 22:05:33 2009 -0400 @@ -24,9 +24,10 @@ New in release 1.5 (2009-05-15) - Other improvements that were breaking specific sites (tag parser fix, nested jar support, etc.) - Added JVM Console (used by http://chrispederick.com/work/web-developer/) +- Removed gcjwebplugin support. - LCMS security fixes. - Many build improvements. -- Many java2d, nio2, pulse java, zero/shark, jtreg fixes. +- Many gervill, java2d, nio2, pulse java, zero/shark, jtreg fixes. - Other bug fixes. New in release 1.4 (2009-01-29) From langel at redhat.com Mon May 18 19:06:04 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 02:06:04 +0000 Subject: changeset in /hg/icedtea6: Added tag icedtea6-1.5rc2 for changes... Message-ID: changeset a4be8c70ca2c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4be8c70ca2c description: Added tag icedtea6-1.5rc2 for changeset c2e865e1be29 diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r c2e865e1be29 -r a4be8c70ca2c .hgtags --- a/.hgtags Mon May 18 22:05:33 2009 -0400 +++ b/.hgtags Mon May 18 22:05:43 2009 -0400 @@ -13,3 +13,4 @@ 6c02b699206db299c6bc96d97d31808bf84f042a 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 +c2e865e1be293835f520e39e07f91f55b4263539 icedtea6-1.5rc2 From langel at redhat.com Mon May 18 19:06:04 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 02:06:04 +0000 Subject: changeset in /hg/icedtea6: 2009-05-17 Lillian Angel changeset 07de70c5883a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=07de70c5883a description: 2009-05-17 Lillian Angel * configure.ac: Set version back to 1.5. diffstat: 3 files changed, 5 insertions(+), 2 deletions(-) .hgtags | 1 - ChangeLog | 4 ++++ configure.ac | 2 +- diffs (28 lines): diff -r a4be8c70ca2c -r 07de70c5883a .hgtags --- a/.hgtags Mon May 18 22:05:43 2009 -0400 +++ b/.hgtags Mon May 18 22:07:07 2009 -0400 @@ -13,4 +13,3 @@ 6c02b699206db299c6bc96d97d31808bf84f042a 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 -c2e865e1be293835f520e39e07f91f55b4263539 icedtea6-1.5rc2 diff -r a4be8c70ca2c -r 07de70c5883a ChangeLog --- a/ChangeLog Mon May 18 22:05:43 2009 -0400 +++ b/ChangeLog Mon May 18 22:07:07 2009 -0400 @@ -1,3 +1,7 @@ 2009-05-17 Lillian Angel + + * configure.ac: Set version back to 1.5. + 2009-05-17 Lillian Angel * NEWS: Updated. Added note about gcjwebplugin removal and Gervill diff -r a4be8c70ca2c -r 07de70c5883a configure.ac --- a/configure.ac Mon May 18 22:05:43 2009 -0400 +++ b/configure.ac Mon May 18 22:07:07 2009 -0400 @@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.6pre], [distro-pk -AC_INIT([icedtea6], [1.6pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6], [1.5], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From langel at redhat.com Mon May 18 19:06:20 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 02:06:20 +0000 Subject: changeset in /hg/icedtea6: Added tag icedtea6-1.5rc2 for changes... Message-ID: changeset 84a527d1a06c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=84a527d1a06c description: Added tag icedtea6-1.5rc2 for changeset 07de70c5883a diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r 07de70c5883a -r 84a527d1a06c .hgtags --- a/.hgtags Mon May 18 22:07:07 2009 -0400 +++ b/.hgtags Mon May 18 22:07:21 2009 -0400 @@ -13,3 +13,4 @@ 6c02b699206db299c6bc96d97d31808bf84f042a 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 +07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2 From langel at redhat.com Mon May 18 19:27:38 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 18 May 2009 22:27:38 -0400 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <49FF3272.1020205@redhat.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> Message-ID: <4A12191A.6050505@redhat.com> Lillian Angel wrote: > Lillian Angel wrote: >> Hi, >> >> I would like to have a release in the new future, which includes the >> new b16 update and several important improvements to the plugin. >> >> Any objections or suggestions? >> >> >> Cheers, >> Lillian > > There is still quite a bit of work to be done for the upcoming 1.5 > release, but I have cloned the main repo: > http://icedtea.classpath.org/hg/release/icedtea6-1.5/ > > It has not been tagged yet, but continue to commit to the main repo > and I will update the 1.5 one when we are ready to go. I have removed this release branch from the server. Too much effort was being duplicated. Since this is a major release, all release work will be based on the main repo using the rc style of tagging. In the case of having a minor release, a separate branch will be created. There is no "freeze" policy. Once everyone agrees that a release candidate is golden, it will be the final release. Does this work for everyone? I am open to suggestions. Lillian From langel at redhat.com Mon May 18 19:43:50 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 18 May 2009 22:43:50 -0400 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <4A12191A.6050505@redhat.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> <4A12191A.6050505@redhat.com> Message-ID: <4A121CE6.4060604@redhat.com> Lillian Angel wrote: > Lillian Angel wrote: >> Lillian Angel wrote: >>> Hi, >>> >>> I would like to have a release in the new future, which includes the >>> new b16 update and several important improvements to the plugin. >>> >>> Any objections or suggestions? >>> >>> >>> Cheers, >>> Lillian >> >> There is still quite a bit of work to be done for the upcoming 1.5 >> release, but I have cloned the main repo: >> http://icedtea.classpath.org/hg/release/icedtea6-1.5/ >> >> It has not been tagged yet, but continue to commit to the main repo >> and I will update the 1.5 one when we are ready to go. > > I have removed this release branch from the server. Too much effort > was being duplicated. Since this is a major release, all release work > will be based on the main repo using the rc style of tagging. In the > case of having a minor release, a separate branch will be created. I should clarify. Minor releases are based on the most recent release + relevant patches added. This is the only reason there is a need for a separate branch- to avoid mix up with other commits since the release it will be based on. > > There is no "freeze" policy. Once everyone agrees that a release > candidate is golden, it will be the final release. > > Does this work for everyone? I am open to suggestions. > > Lillian From gbenson at redhat.com Tue May 19 01:11:31 2009 From: gbenson at redhat.com (Gary Benson) Date: Tue, 19 May 2009 09:11:31 +0100 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <4A12191A.6050505@redhat.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> <4A12191A.6050505@redhat.com> Message-ID: <20090519081130.GB3155@redhat.com> Lillian Angel wrote: > Lillian Angel wrote: > > Lillian Angel wrote: > > > I would like to have a release in the new future, which includes > > > the new b16 update and several important improvements to the > > > plugin. > > > > There is still quite a bit of work to be done for the upcoming 1.5 > > release, but I have cloned the main repo: > > http://icedtea.classpath.org/hg/release/icedtea6-1.5/ > > > > It has not been tagged yet, but continue to commit to the main repo > > and I will update the 1.5 one when we are ready to go. > > I have removed this release branch from the server. Too much effort > was being duplicated. Since this is a major release, all release > work will be based on the main repo using the rc style of > tagging. In the case of having a minor release, a separate branch > will be created. > > There is no "freeze" policy. Once everyone agrees that a release > candidate is golden, it will be the final release. > > Does this work for everyone? I am open to suggestions. Works for me. Good idea with the rcX tags too btw. Cheers, Gary -- http://gbenson.net/ From bugzilla-daemon at icedtea.classpath.org Tue May 19 02:16:24 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 May 2009 09:16:24 +0000 Subject: [Bug 334] allow specifying explicit target arch Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=334 ------- Comment #3 from gbenson at redhat.com 2009-05-19 09:16 ------- This looks ok to me -- 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 Tue May 19 02:18:48 2009 From: gbenson at redhat.com (Gary Benson) Date: Tue, 19 May 2009 10:18:48 +0100 Subject: RFC: next cross-compilation patch: override 'uname -m' In-Reply-To: <4A116FDD.3090601@gmx.net> References: <4A116FDD.3090601@gmx.net> Message-ID: <20090519091848.GC3155@redhat.com> Robert Schuster wrote: > thanks all for helping me getting the first cross-compilation patch > in. Now comes the second one. I described its purpose here: > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=334 > > I hope to hear from you soon. Would be cool if we can get get > IcedTea 100% cross-compile ready in the 1.6 timeframe. :) This looks ok to me. Cheers, Gary -- http://gbenson.net/ From gbenson at redhat.com Tue May 19 02:24:00 2009 From: gbenson at redhat.com (Gary Benson) Date: Tue, 19 May 2009 10:24:00 +0100 Subject: alpha, mips, mipsel and ppc64 listed explicitly in SET_ARCH_DIRS Message-ID: <20090519092359.GD3155@redhat.com> Hi all (and specifically doko), I just noticed that alpha, mips, mipsel and ppc64 are listed explicitly in the SET_ARCH_DIRS bit of acinclude.m4, but they don't seem to have any special behaviour that stops them using the default case. I know ppc64's "uname -m" says "ppc64", and I seem to remember alpha's says "alpha". What do mips and mipsel do? Any platforms that can be handled by the default case probably should be. Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Tue May 19 02:24:25 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 19 May 2009 10:24:25 +0100 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <4A12191A.6050505@redhat.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> <4A12191A.6050505@redhat.com> Message-ID: <4A127AC9.9060204@redhat.com> Lillian Angel wrote: > Lillian Angel wrote: >> Lillian Angel wrote: >>> Hi, >>> >>> I would like to have a release in the new future, which includes the >>> new b16 update and several important improvements to the plugin. >>> >>> Any objections or suggestions? >> >> There is still quite a bit of work to be done for the upcoming 1.5 >> release, but I have cloned the main repo: >> http://icedtea.classpath.org/hg/release/icedtea6-1.5/ >> >> It has not been tagged yet, but continue to commit to the main repo >> and I will update the 1.5 one when we are ready to go. > > I have removed this release branch from the server. Too much effort was > being duplicated. Since this is a major release, all release work will > be based on the main repo using the rc style of tagging. In the case of > having a minor release, a separate branch will be created. > > There is no "freeze" policy. Once everyone agrees that a release > candidate is golden, it will be the final release. > > Does this work for everyone? I am open to suggestions. I think we should do this in the same way that is used for many other free software projects: 1. Pick a branch point on the trunk. Now seems like a good time. Make a branch from that branch point. 2. Test that release branch. Make corrections where needed. 3. Make the release from the release branch. There's no advantage to releasing directly from the trunk. If it just so happens that there is no difference between the release branch and the trunk at the time of release, that's fine. Andrew. From thebohemian at gmx.net Tue May 19 02:31:27 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Tue, 19 May 2009 11:31:27 +0200 Subject: RFC: xulrunner compilation check not optional In-Reply-To: <4A1167D8.4020601@gmx.net> References: <4A1167D8.4020601@gmx.net> Message-ID: <4A127C6F.8080403@gmx.net> Hi, the former patch was not quite right. This one fixes the use of 'test' and has better indentation. Regards Robert Robert Schuster schrieb: > Hi, > current tip does not build if you disable plugin and npplugin since a > check for the mozilla headers is compiled anyways. The attached patch > (preliminary, needs better formatting) makes the check dependend on > whether any of the plugins is enabled. > > I am also not 100% sure if it is right. Maybe xulrunner is also needed > for other stuff. > > I talked to Mark on IRC about this and was asked to post the patch here. > > Regards > Robert > -------------- next part -------------- A non-text attachment was scrubbed... Name: optional-xulrunner-check.patch Type: text/x-patch Size: 1219 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090519/13d5c31a/optional-xulrunner-check.patch -------------- 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/20090519/13d5c31a/signature.asc From gnu_andrew at member.fsf.org Tue May 19 02:44:33 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 19 May 2009 10:44:33 +0100 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <4A127AC9.9060204@redhat.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> <4A12191A.6050505@redhat.com> <4A127AC9.9060204@redhat.com> Message-ID: <17c6771e0905190244n7b89e4ffte58bbd3fff82191@mail.gmail.com> 2009/5/19 Andrew Haley : > Lillian Angel wrote: >> Lillian Angel wrote: >>> Lillian Angel wrote: >>>> Hi, >>>> >>>> I would like to have a release in the new future, which includes the >>>> new b16 update and several important improvements to the plugin. >>>> >>>> Any objections or suggestions? >>> >>> There is still quite a bit of work to be done for the upcoming 1.5 >>> release, but I have cloned the main repo: >>> http://icedtea.classpath.org/hg/release/icedtea6-1.5/ >>> >>> It has not been tagged yet, but continue to commit to the main repo >>> and I will update the 1.5 one when we are ready to go. >> >> I have removed this release branch from the server. Too much effort was >> being duplicated. Since this is a major release, all release work will >> be based on the main repo using the rc style of tagging. In the case of >> having a minor release, a separate branch will be created. >> >> There is no "freeze" policy. Once everyone agrees that a release >> candidate is golden, it will be the final release. >> >> Does this work for everyone? I am open to suggestions. > > I think we should do this in the same way that is used for many other > free software projects: > > 1. ?Pick a branch point on the trunk. ?Now seems like a good time. > Make a branch from that branch point. > > 2. ?Test that release branch. ?Make corrections where needed. > > 3. ?Make the release from the release branch. > > There's no advantage to releasing directly from the trunk. > > If it just so happens that there is no difference between the release > branch and the trunk at the time of release, that's fine. > > Andrew. > I agree. With creating the release directly from trunk, either the tree has to be frozen during the release period or there is a risk of commits being made that will destabilise the pending release. A branch that is identical to trunk should be largely zero cost if created on the remote server (see Mark's email: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-February/004877.html). It also means that security fixes can be made available immediately for the last release. I did this with IcedTea7 1.9.1 for the last batch of updates. We still don't have a release of IcedTea6 that includes these fixes until 1.5 becomes available. -- 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 aph at redhat.com Tue May 19 02:49:06 2009 From: aph at redhat.com (Andrew Haley) Date: Tue, 19 May 2009 10:49:06 +0100 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <17c6771e0905190244n7b89e4ffte58bbd3fff82191@mail.gmail.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> <4A12191A.6050505@redhat.com> <4A127AC9.9060204@redhat.com> <17c6771e0905190244n7b89e4ffte58bbd3fff82191@mail.gmail.com> Message-ID: <4A128092.20108@redhat.com> Andrew John Hughes wrote: > 2009/5/19 Andrew Haley : >> Lillian Angel wrote: >>> Lillian Angel wrote: >>>> Lillian Angel wrote: >>>>> Hi, >>>>> >>>>> I would like to have a release in the new future, which includes the >>>>> new b16 update and several important improvements to the plugin. >>>>> >>>>> Any objections or suggestions? >>>> There is still quite a bit of work to be done for the upcoming 1.5 >>>> release, but I have cloned the main repo: >>>> http://icedtea.classpath.org/hg/release/icedtea6-1.5/ >>>> >>>> It has not been tagged yet, but continue to commit to the main repo >>>> and I will update the 1.5 one when we are ready to go. >>> I have removed this release branch from the server. Too much effort was >>> being duplicated. Since this is a major release, all release work will >>> be based on the main repo using the rc style of tagging. In the case of >>> having a minor release, a separate branch will be created. >>> >>> There is no "freeze" policy. Once everyone agrees that a release >>> candidate is golden, it will be the final release. >>> >>> Does this work for everyone? I am open to suggestions. >> I think we should do this in the same way that is used for many other >> free software projects: >> >> 1. Pick a branch point on the trunk. Now seems like a good time. >> Make a branch from that branch point. >> >> 2. Test that release branch. Make corrections where needed. >> >> 3. Make the release from the release branch. >> >> There's no advantage to releasing directly from the trunk. >> >> If it just so happens that there is no difference between the release >> branch and the trunk at the time of release, that's fine. > > I agree. With creating the release directly from trunk, either the > tree has to be frozen during the release period or there is a risk of > commits being made that will destabilise the pending release. A > branch that is identical to trunk should be largely zero cost if > created on the remote server (see Mark's email: > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-February/004877.html). > > It also means that security fixes can be made available immediately > for the last release. I did this with IcedTea7 1.9.1 for the last > batch of updates. We still don't have a release of IcedTea6 that > includes these fixes until 1.5 becomes available. In my mind, the main advantage to releasing from a branch in the normal way it that it's much easier for other people to look at the repository and understand what is going on. It's a more open process that makes it much easier for people to come into this community and participate. Having spent a lot of time doing software archaeology on very old projects, I really appreciate transparency and repeatability of processes. Andrew. From gnu_andrew at member.fsf.org Tue May 19 02:53:59 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 19 May 2009 10:53:59 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> Message-ID: <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> 2009/5/8 Andrew John Hughes : > Dear all, > > Sun plan to release a JavaOne preview of JDK7 on May 21st > (http://openjdk.java.net/projects/jdk7/milestones/). > We'd like to do a corresponding release of IcedTea7 (1.10) around the > same time, that can then be packaged in any distros that wish to ship > such a preview. > This will involve: > > * Updating IcedTea7 to support the latest build drop from Sun > (currently b57, which is the last non-stabilisation release). > IcedTea7 is now based on the IcedTea forest > (http://hg.openjdk.java.net/icedtea/jdk7) so this is a two stage > process involving pulling the latest changes into the forest and then > ensuring this builds with IcedTea7. > * Updating Shark/Zero in IcedTea7; ideally we would put this directly > into the forest, but I don't know how ready Gary is for this step. > * Updating the plugin/jaxws support; again it would be nice to have it > in the forest, but there probably isn't enough time. > * Any additional features from IcedTea6; we're not doing mass merges > any more because the two have diverged so far from each other that > this has become impractical (probably lots of conflicts and build > breakages for a few usable changes). ?doko and mjw have already > requested that --with-additional-vms and systemtap support be added. > > Any help would be much appreciated. ?Integration of Shark/Zero and the > plugin can be done fairly independently so if someone wants to work on > this, feel free. > -- > 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 > IcedTea7 should now fully bootstrap with the current tip of the IcedTea forest, which is synced to b59, the latest OpenJDK7 build drop. This is likely to be the last one (if there is a b60, any changes will be minor). I'm now going to sync up Shark/Zero, the plugin and VisualVM, and add mjw and doko's patches. Once that's complete, a 1.10 branch will be created. However, please start testing the tree as it stands and let me know of any issues as soon as possible. I aim to release IcedTea7 1.10 on Friday afternoon (UTC), barring any blockers. -- 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 robertschuster at fsfe.org Tue May 19 04:10:51 2009 From: robertschuster at fsfe.org (Robert Schuster) Date: Tue, 19 May 2009 11:10:51 +0000 Subject: changeset in /hg/icedtea6: 2009-05-18 Robert Schuster changeset 802bb547f651 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=802bb547f651 description: 2009-05-18 Robert Schuster * acinclude.m4: Set TARGET_ARCH. * Makefile.am: Set TARGET_ARCH in IcedTea and IcedTea-ECJ builds when ENABLE_CROSS_COMPILATION is true. * patches/icedtea-explicit-target-arch.patch: New patch (SCA in place). diffstat: 4 files changed, 92 insertions(+), 2 deletions(-) ChangeLog | 7 ++ Makefile.am | 7 ++ acinclude.m4 | 12 ++++ patches/icedtea-explicit-target-arch.patch | 68 ++++++++++++++++++++++++++++ diffs (198 lines): diff -r 84a527d1a06c -r 802bb547f651 ChangeLog --- a/ChangeLog Mon May 18 22:07:21 2009 -0400 +++ b/ChangeLog Tue May 19 13:11:47 2009 +0200 @@ -1,3 +1,10 @@ 2009-05-17 Lillian Angel + + * acinclude.m4: Set TARGET_ARCH. + * Makefile.am: Set TARGET_ARCH in IcedTea and IcedTea-ECJ builds + when ENABLE_CROSS_COMPILATION is true. + * patches/icedtea-explicit-target-arch.patch: New patch (SCA in place). + 2009-05-17 Lillian Angel * configure.ac: Set version back to 1.5. diff -r 84a527d1a06c -r 802bb547f651 Makefile.am --- a/Makefile.am Mon May 18 22:07:21 2009 -0400 +++ b/Makefile.am Tue May 19 13:11:47 2009 +0200 @@ -201,7 +201,8 @@ endif if ENABLE_CROSS_COMPILATION ICEDTEA_ENV += \ - "CROSS_COMPILATION=true" + "CROSS_COMPILATION=true" \ + "TARGET_ARCH=$(TARGET_ARCH)" endif if USE_ALT_JAR @@ -283,7 +284,8 @@ endif if ENABLE_CROSS_COMPILATION ICEDTEA_ENV_ECJ += \ - "CROSS_COMPILATION=true" + "CROSS_COMPILATION=true" \ + "TARGET_ARCH=$(TARGET_ARCH)" endif env-ecj: @@ -661,6 +663,7 @@ ICEDTEA_PATCHES += \ patches/icedtea-java2d-stroker-internal-joint.patch \ patches/icedtea-java2d-stroker-internal-close-joint.patch \ patches/icedtea-disable-cc-incompatible-sanity-checks.patch \ + patches/icedtea-explicit-target-arch.patch \ $(DISTRIBUTION_PATCHES) stamps/extract.stamp: stamps/download.stamp diff -r 84a527d1a06c -r 802bb547f651 acinclude.m4 --- a/acinclude.m4 Mon May 18 22:07:21 2009 -0400 +++ b/acinclude.m4 Tue May 19 13:11:47 2009 +0200 @@ -5,65 +5,77 @@ AC_DEFUN([SET_ARCH_DIRS], BUILD_ARCH_DIR=amd64 INSTALL_ARCH_DIR=amd64 JRE_ARCH_DIR=amd64 + TARGET_ARCH=x86_64 ;; i?86-*-*) BUILD_ARCH_DIR=i586 INSTALL_ARCH_DIR=i386 JRE_ARCH_DIR=i386 ARCH_PREFIX=${LINUX32} + TARGET_ARCH=i386 ;; alpha*-*-*) BUILD_ARCH_DIR=alpha INSTALL_ARCH_DIR=alpha JRE_ARCH_DIR=alpha + TARGET_ARCH=alpha ;; arm*-*-*) BUILD_ARCH_DIR=arm INSTALL_ARCH_DIR=arm JRE_ARCH_DIR=arm + TARGET_ARCH=arm ;; mips-*-*) BUILD_ARCH_DIR=mips INSTALL_ARCH_DIR=mips JRE_ARCH_DIR=mips + TARGET_ARCH=mips ;; mipsel-*-*) BUILD_ARCH_DIR=mipsel INSTALL_ARCH_DIR=mipsel JRE_ARCH_DIR=mipsel + TARGET_ARCH=mipsel ;; powerpc-*-*) BUILD_ARCH_DIR=ppc INSTALL_ARCH_DIR=ppc JRE_ARCH_DIR=ppc ARCH_PREFIX=${LINUX32} + TARGET_ARCH=ppc ;; powerpc64-*-*) BUILD_ARCH_DIR=ppc64 INSTALL_ARCH_DIR=ppc64 JRE_ARCH_DIR=ppc64 + TARGET_ARCH=ppc64 ;; sparc64-*-*) BUILD_ARCH_DIR=sparcv9 INSTALL_ARCH_DIR=sparcv9 JRE_ARCH_DIR=sparc64 + TARGET_ARCH=sparc64 ;; s390-*-*) BUILD_ARCH_DIR=s390 INSTALL_ARCH_DIR=s390 JRE_ARCH_DIR=s390 ARCH_PREFIX=${LINUX32} + TARGET_ARCH=s390 ;; *) BUILD_ARCH_DIR=`uname -m` INSTALL_ARCH_DIR=$BUILD_ARCH_DIR JRE_ARCH_DIR=$INSTALL_ARCH_DIR + TARGET_ARCH=$BUILD_ARCH_DIR ;; esac AC_SUBST(BUILD_ARCH_DIR) AC_SUBST(INSTALL_ARCH_DIR) AC_SUBST(JRE_ARCH_DIR) AC_SUBST(ARCH_PREFIX) + AC_SUBST(TARGET_ARCH) ]) AC_DEFUN([SET_OS_DIRS], diff -r 84a527d1a06c -r 802bb547f651 patches/icedtea-explicit-target-arch.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-explicit-target-arch.patch Tue May 19 13:11:47 2009 +0200 @@ -0,0 +1,68 @@ +Index: openjdk/hotspot/make/linux/makefiles/defs.make +=================================================================== +--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2009-05-18 14:09:57.812930043 +0200 ++++ openjdk/hotspot/make/linux/makefiles/defs.make 2009-05-18 14:30:46.318871170 +0200 +@@ -1,4 +1,4 @@ +-# ++ + # Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # +@@ -29,7 +29,11 @@ + SLASH_JAVA ?= /java + + # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name +-ARCH:=$(shell uname -m) ++ifndef CROSS_COMPILATION ++ ARCH:=$(shell uname -m) ++else ++ ARCH:=$(TARGET_ARCH) ++endif + PATH_SEP = : + ifeq ($(LP64), 1) + ARCH_DATA_MODEL ?= 64 +Index: openjdk/jdk/make/common/shared/Platform.gmk +=================================================================== +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2009-05-18 14:09:57.950854863 +0200 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2009-05-18 14:18:59.387528133 +0200 +@@ -190,9 +190,13 @@ + OS_NAME = linux + OS_VERSION := $(shell uname -r) + # Arch and OS name/version +- mach := $(shell uname -m) +- ifneq (,$(wildcard /usr/bin/dpkg-architecture)) +- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') ++ ifndef CROSS_COMPILATION ++ mach := $(shell uname -m) ++ ifneq (,$(wildcard /usr/bin/dpkg-architecture)) ++ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') ++ endif ++ else ++ mach := $(TARGET_ARCH) + endif + archExpr = case "$(mach)" in \ + i[3-9]86) \ +Index: openjdk/corba/make/common/shared/Platform.gmk +=================================================================== +--- openjdk.orig/corba/make/common/shared/Platform.gmk 2009-05-18 14:09:58.044921758 +0200 ++++ openjdk/corba/make/common/shared/Platform.gmk 2009-05-18 14:17:30.760805124 +0200 +@@ -179,10 +179,15 @@ + PLATFORM = linux + OS_NAME = linux + OS_VERSION := $(shell uname -r) +- # Arch and OS name/version +- mach := $(shell uname -m) +- ifneq (,$(wildcard /usr/bin/dpkg-architecture)) +- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') ++ ifndef CROSS_COMPILATION ++ # Not cross-compiling. Take architecture from running system. ++ mach := $(shell uname -m) ++ ifneq (,$(wildcard /usr/bin/dpkg-architecture)) ++ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') ++ endif ++ else ++ # Cross-compilation: Assume target archicture is given. ++ mach := $(TARGET_ARCH) + endif + archExpr = case "$(mach)" in \ + i[3-9]86) \ From robertschuster at fsfe.org Tue May 19 04:13:13 2009 From: robertschuster at fsfe.org (Robert Schuster) Date: Tue, 19 May 2009 11:13:13 +0000 Subject: changeset in /hg/icedtea6: 2009-05-18 Robert Schuster changeset 926c38e2b283 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=926c38e2b283 description: 2009-05-18 Robert Schuster * NEWS: Added note about cross-compilation support diffstat: 2 files changed, 5 insertions(+) ChangeLog | 4 ++++ NEWS | 1 + diffs (22 lines): diff -r 802bb547f651 -r 926c38e2b283 ChangeLog --- a/ChangeLog Tue May 19 13:11:47 2009 +0200 +++ b/ChangeLog Tue May 19 13:14:09 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-18 Robert Schuster + + * NEWS: Added note about cross-compilation support. + 2009-05-18 Robert Schuster * acinclude.m4: Set TARGET_ARCH. diff -r 802bb547f651 -r 926c38e2b283 NEWS --- a/NEWS Tue May 19 13:11:47 2009 +0200 +++ b/NEWS Tue May 19 13:14:09 2009 +0200 @@ -28,6 +28,7 @@ New in release 1.5 (2009-05-15) - LCMS security fixes. - Many build improvements. - Many gervill, java2d, nio2, pulse java, zero/shark, jtreg fixes. +- Experimental out-of-the-box cross-compilation support (not yet finished) - Other bug fixes. New in release 1.4 (2009-01-29) From langel at redhat.com Tue May 19 05:03:17 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 08:03:17 -0400 Subject: Proposed IcedTea6-1.5 Release In-Reply-To: <4A128092.20108@redhat.com> References: <49FAFB05.5030509@redhat.com> <49FF3272.1020205@redhat.com> <4A12191A.6050505@redhat.com> <4A127AC9.9060204@redhat.com> <17c6771e0905190244n7b89e4ffte58bbd3fff82191@mail.gmail.com> <4A128092.20108@redhat.com> Message-ID: <4A12A005.6010801@redhat.com> Andrew Haley wrote: > Andrew John Hughes wrote: > >> 2009/5/19 Andrew Haley : >> >>> Lillian Angel wrote: >>> >>>> Lillian Angel wrote: >>>> >>>>> Lillian Angel wrote: >>>>> >>>>>> Hi, >>>>>> >>>>>> I would like to have a release in the new future, which includes the >>>>>> new b16 update and several important improvements to the plugin. >>>>>> >>>>>> Any objections or suggestions? >>>>>> >>>>> There is still quite a bit of work to be done for the upcoming 1.5 >>>>> release, but I have cloned the main repo: >>>>> http://icedtea.classpath.org/hg/release/icedtea6-1.5/ >>>>> >>>>> It has not been tagged yet, but continue to commit to the main repo >>>>> and I will update the 1.5 one when we are ready to go. >>>>> >>>> I have removed this release branch from the server. Too much effort was >>>> being duplicated. Since this is a major release, all release work will >>>> be based on the main repo using the rc style of tagging. In the case of >>>> having a minor release, a separate branch will be created. >>>> >>>> There is no "freeze" policy. Once everyone agrees that a release >>>> candidate is golden, it will be the final release. >>>> >>>> Does this work for everyone? I am open to suggestions. >>>> >>> I think we should do this in the same way that is used for many other >>> free software projects: >>> >>> 1. Pick a branch point on the trunk. Now seems like a good time. >>> Make a branch from that branch point. >>> >>> 2. Test that release branch. Make corrections where needed. >>> >>> 3. Make the release from the release branch. >>> >>> There's no advantage to releasing directly from the trunk. >>> >>> If it just so happens that there is no difference between the release >>> branch and the trunk at the time of release, that's fine. >>> >> I agree. With creating the release directly from trunk, either the >> tree has to be frozen during the release period or there is a risk of >> commits being made that will destabilise the pending release. A >> branch that is identical to trunk should be largely zero cost if >> created on the remote server (see Mark's email: >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-February/004877.html). >> >> It also means that security fixes can be made available immediately >> for the last release. I did this with IcedTea7 1.9.1 for the last >> batch of updates. We still don't have a release of IcedTea6 that >> includes these fixes until 1.5 becomes available. >> > > In my mind, the main advantage to releasing from a branch in the > normal way it that it's much easier for other people to look at the > repository and understand what is going on. It's a more open process > that makes it much easier for people to come into this community and > participate. > > Having spent a lot of time doing software archaeology on very old > projects, I really appreciate transparency and repeatability of > processes. Ok great. That sounds fine. I will create the branch from the rc2 tag. Cheers, Lillian From langel at redhat.com Tue May 19 05:03:40 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 12:03:40 +0000 Subject: changeset in /hg/icedtea6: Added tag icedtea6-1.5rc3 for changes... Message-ID: changeset 9c7ea5372fcf in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9c7ea5372fcf description: Added tag icedtea6-1.5rc3 for changeset 926c38e2b283 diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r 926c38e2b283 -r 9c7ea5372fcf .hgtags --- a/.hgtags Tue May 19 13:14:09 2009 +0200 +++ b/.hgtags Tue May 19 08:04:40 2009 -0400 @@ -14,3 +14,4 @@ 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2 +926c38e2b2830971f6ca0dff2ce25f78a694b178 icedtea6-1.5rc3 From langel at redhat.com Tue May 19 05:10:17 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 08:10:17 -0400 Subject: IcedTea6-1.5 release branch created Message-ID: <4A12A1A9.8050903@redhat.com> Hi, I have tagged the main repo with the tag "icedtea6-1.5rc3" and created the release branch here: http://icedtea.classpath.org/hg/release/icedtea6-1.5 Any patches that are required to go into the release branch should be discussed on list. If they are approved to go in, they must be applied to both the main branch and the release branch. Cheers, Lillian From robertschuster at fsfe.org Tue May 19 06:07:16 2009 From: robertschuster at fsfe.org (Robert Schuster) Date: Tue, 19 May 2009 13:07:16 +0000 Subject: changeset in /hg/icedtea6: 2009-05-18 Robert Schuster changeset ea3bc7968a1c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ea3bc7968a1c description: 2009-05-18 Robert Schuster * Makefile.am: Corrected quoting of cross-compilation Makefile arguments. diffstat: 2 files changed, 8 insertions(+), 4 deletions(-) ChangeLog | 4 ++++ Makefile.am | 8 ++++---- diffs (36 lines): diff -r 9c7ea5372fcf -r ea3bc7968a1c ChangeLog --- a/ChangeLog Tue May 19 08:04:40 2009 -0400 +++ b/ChangeLog Tue May 19 15:08:12 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-18 Robert Schuster + + * Makefile.am: Corrected quoting of cross-compilation Makefile arguments. + 2009-05-18 Robert Schuster * NEWS: Added note about cross-compilation support. diff -r 9c7ea5372fcf -r ea3bc7968a1c Makefile.am --- a/Makefile.am Tue May 19 08:04:40 2009 -0400 +++ b/Makefile.am Tue May 19 15:08:12 2009 +0200 @@ -201,8 +201,8 @@ endif if ENABLE_CROSS_COMPILATION ICEDTEA_ENV += \ - "CROSS_COMPILATION=true" \ - "TARGET_ARCH=$(TARGET_ARCH)" + CROSS_COMPILATION="true" \ + TARGET_ARCH="$(TARGET_ARCH)" endif if USE_ALT_JAR @@ -284,8 +284,8 @@ endif if ENABLE_CROSS_COMPILATION ICEDTEA_ENV_ECJ += \ - "CROSS_COMPILATION=true" \ - "TARGET_ARCH=$(TARGET_ARCH)" + CROSS_COMPILATION="true" \ + TARGET_ARCH="$(TARGET_ARCH)" endif env-ecj: From bugzilla-daemon at icedtea.classpath.org Tue May 19 06:11:53 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 May 2009 13:11:53 +0000 Subject: [Bug 335] New: --disable-plugin makes ./configure fail Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=335 Summary: --disable-plugin makes ./configure fail Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: thebohemian at gmx.net Hi, with current tip configure fails always when --disable-plugin is given. The reason is that the configure script does a compilation test against mozilla headers/libraries. Since no location was given for them the test fails. However the test should be avoided completely if the plugin compilation is disabled. -- 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 May 19 06:12:28 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 May 2009 13:12:28 +0000 Subject: [Bug 335] --disable-plugin makes ./configure fail Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=335 ------- Comment #1 from thebohemian at gmx.net 2009-05-19 13:12 ------- Created an attachment (id=214) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=214&action=view) fix --disable-plugin causing configure to fail This patch should fix the issue,. -- 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 Tue May 19 06:14:21 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Tue, 19 May 2009 15:14:21 +0200 Subject: IcedTea6-1.5 release branch created In-Reply-To: <4A12A1A9.8050903@redhat.com> References: <4A12A1A9.8050903@redhat.com> Message-ID: <4A12B0AD.5040403@gmx.net> Hi, Lillian Angel schrieb: > Hi, > > I have tagged the main repo with the tag "icedtea6-1.5rc3" and created > the release branch here: > http://icedtea.classpath.org/hg/release/icedtea6-1.5 > > Any patches that are required to go into the release branch should be > discussed on list. If they are approved to go in, they must be applied > to both the main branch and the release branch. please also have a look at my xulrunner fix. I've opened a PR for it: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=335 I would like to see that in the trunk as well as the release branch. 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/20090519/8b45ef09/signature.asc From langel at redhat.com Tue May 19 06:17:43 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 09:17:43 -0400 Subject: IcedTea6-1.5 release branch created In-Reply-To: <4A12B0AD.5040403@gmx.net> References: <4A12A1A9.8050903@redhat.com> <4A12B0AD.5040403@gmx.net> Message-ID: <4A12B177.4030705@redhat.com> Robert Schuster wrote: > Hi, > > Lillian Angel schrieb: > >> Hi, >> >> I have tagged the main repo with the tag "icedtea6-1.5rc3" and created >> the release branch here: >> http://icedtea.classpath.org/hg/release/icedtea6-1.5 >> >> Any patches that are required to go into the release branch should be >> discussed on list. If they are approved to go in, they must be applied >> to both the main branch and the release branch. >> > please also have a look at my xulrunner fix. I've opened a PR for it: > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=335 > > I would like to see that in the trunk as well as the release branch. > I just saw that, please commit the fix to both branches. Thanks! Lillian > Regards > Robert > > > From langel at redhat.com Tue May 19 06:47:53 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 19 May 2009 13:47:53 +0000 Subject: changeset in /hg/icedtea6: 2009-05-18 Lillian Angel changeset edaa3e573644 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=edaa3e573644 description: 2009-05-18 Lillian Angel * NEWS: Fixed typo. * README: Updated plugin info. diffstat: 4 files changed, 40 insertions(+), 37 deletions(-) ChangeLog | 5 ++++ NEWS | 4 +-- README | 40 ++++++++------------------------------- generated/sun/misc/Version.java | 28 +++++++++++++++++++++++---- diffs (132 lines): diff -r ea3bc7968a1c -r edaa3e573644 ChangeLog --- a/ChangeLog Tue May 19 15:08:12 2009 +0200 +++ b/ChangeLog Tue May 19 09:48:55 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-18 Robert Schuster + + * NEWS: Fixed typo. + * README: Updated plugin info. + 2009-05-18 Robert Schuster * Makefile.am: Corrected quoting of cross-compilation Makefile arguments. diff -r ea3bc7968a1c -r edaa3e573644 NEWS --- a/NEWS Tue May 19 15:08:12 2009 +0200 +++ b/NEWS Tue May 19 09:48:55 2009 -0400 @@ -1,4 +1,4 @@ New in release 1.5 (2009-05-15) -New in release 1.5 (2009-05-15) +New in release 1.5 (2009-05-20) - Static trace support through systemtap. When given the configure option --enable-systemtap IcedTea will build @@ -13,7 +13,7 @@ New in release 1.5 (2009-05-15) - Update to latest HotSpot minor build (hs14b10-->hs14b15) from the new HotSpot Express repository. - Updated to OpenJDK b16 build. -- Visual VM updated to 1.1.1. +- VisualVM updated to 1.1.1. - Updated to support CACAO 0.99.4. - Several web browser plugin and javaws support fixes: - Fixed security handling to prevent access denials when there is a site diff -r ea3bc7968a1c -r edaa3e573644 README --- a/README Tue May 19 15:08:12 2009 +0200 +++ b/README Tue May 19 09:48:55 2009 -0400 @@ -87,39 +87,17 @@ license header. Instances are: - We are assuming that these files are owned by Sun: openjdk/jdk/src/share/classes/**/resources/*.properties +Web Browser Plugin support +=========================== -gcjwebplugin -============ +The default web browser plugin has LiveConnect support. It will only build +against a very recent version of XULRunner, such as that available in Fedora +Rawhide as of 2008-05-16. The required development headers are provided by +the xulrunner-devel package. -gcjwebplugin provides basic support for running applets in -Mozilla-based web browsers. It does not support applet/Javascript -communication (LiveConnect) and support for signed applets needs -further testing. The current applet security manager may be too -strict and may require tuning to allow otherwise-legitimate calls by -untrusted applets. - -gcjwebplugin itself is a shared object, gcjwebplugin.so, built from a -single source file, gcjwebplugin.cc. The IcedTea adaptation of -gcjwebplugin communicates through named pipes with a modified version -of IcedTea's appletviewer. Two source files, -openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java, -openjdk/jdk/src/share/classes/sun/applet/PluginMain.java are added to -rt.jar and tools.jar to provide gcjwebplugin with an interface into -the appletviewer code. This support code is provided in -patches/icedtea-plugin.patch. - -Experimental LiveConnect support -================================ - -The configure option --enable-liveconnect enables experimental -LiveConnect support, implemented by IcedTeaPlugin.cc and -patches/icedtea-liveconnect.patch. Currently IcedTeaPlugin.cc will -only build against a very recent version of XULRunner, such as that -available in Fedora Rawhide as of 2008-02-23. The required -development headers are provided by the xulrunner-devel package. - -To run IcedTeaPlugin you'll need to add -/usr/lib/xulrunner-sdk-1.9pre/sdk/lib/ to LD_LIBRARY_PATH. +A new plugin is being developed to support the new Mozilla API changes. It can +be enabled with the option --enable-npplugin, and it is based on gcjwebplugin. +At the moment there is no liveconnect support for it. NetX ==== diff -r ea3bc7968a1c -r edaa3e573644 generated/sun/awt/X11/generator/sizer.32 Binary file generated/sun/awt/X11/generator/sizer.32 has changed diff -r ea3bc7968a1c -r edaa3e573644 generated/sun/misc/Version.java --- a/generated/sun/misc/Version.java Tue May 19 15:08:12 2009 +0200 +++ b/generated/sun/misc/Version.java Tue May 19 09:48:55 2009 -0400 @@ -39,7 +39,13 @@ public class Version { "OpenJDK Runtime Environment"; private static final String java_runtime_version = - "1.6.0_0-b12"; + "1.6.0_0-b16"; + + private static final String jdk_derivative_name = + "IcedTea6 1.5-r84a527d1a06c"; + + private static final String distro_package_version = + ""; static { init(); @@ -81,12 +87,26 @@ public class Version { /* First line: platform version. */ ps.println(launcher_name + " version \"" + java_version + "\""); + String java_vm_name = System.getProperty("java.vm.name"); + /* Second line: runtime version (ie, libraries). */ - ps.println(java_runtime_name + " (build " + - java_runtime_version + ")"); + StringBuilder sb = new StringBuilder(); + if (java_vm_name.toLowerCase().startsWith("cacao")) { + sb.append("IcedTea Runtime Environment"); + } else { + sb.append(java_runtime_name); + } + if (jdk_derivative_name.length() > 0) { + sb.append(" (").append(jdk_derivative_name).append(")"); + } + if (distro_package_version.length() > 0) { + sb.append(" (").append(distro_package_version).append(")"); + } else { + sb.append(" (build ").append(java_runtime_version).append(")"); + } + ps.println(sb.toString()); /* Third line: JVM information. */ - String java_vm_name = System.getProperty("java.vm.name"); String java_vm_version = System.getProperty("java.vm.version"); String java_vm_info = System.getProperty("java.vm.info"); ps.println(java_vm_name + " (build " + java_vm_version + ", " + From robertschuster at fsfe.org Tue May 19 07:22:19 2009 From: robertschuster at fsfe.org (Robert Schuster) Date: Tue, 19 May 2009 14:22:19 +0000 Subject: changeset in /hg/icedtea6: 2009-05-18 Robert Schuster changeset e810f0b2a98b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e810f0b2a98b description: 2009-05-18 Robert Schuster * configure.ac: Make xulrunner compilation check optional. diffstat: 2 files changed, 18 insertions(+), 12 deletions(-) ChangeLog | 4 ++++ configure.ac | 26 ++++++++++++++------------ diffs (54 lines): diff -r edaa3e573644 -r e810f0b2a98b ChangeLog --- a/ChangeLog Tue May 19 09:48:55 2009 -0400 +++ b/ChangeLog Tue May 19 16:23:15 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-18 Lillian Angel + + * configure.ac: Make xulrunner compilation check optional. + 2009-05-18 Lillian Angel * NEWS: Fixed typo. diff -r edaa3e573644 -r e810f0b2a98b configure.ac --- a/configure.ac Tue May 19 09:48:55 2009 -0400 +++ b/configure.ac Tue May 19 16:23:15 2009 +0200 @@ -491,13 +491,15 @@ if test "x${enable_npplugin}" = "xyes" AC_SUBST(GTK_LIBS) fi -AC_LANG_PUSH([C++]) -OLDCPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" - -AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ +if test "x${enable_plugin}" = "xyes" -o "x${enable_npplugin}" = "xyes" +then + AC_LANG_PUSH([C++]) + OLDCPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" + + AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ #include #include #include @@ -534,11 +536,11 @@ return EXIT_SUCCESS; [AC_MSG_FAILURE([cannot determine xulrunner version])])], [xulrunner_cv_collapsed_version="190000"]) -CPPFLAGS="$OLDCPPFLAGS" -AC_LANG_POP([C++]) - -AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) - + CPPFLAGS="$OLDCPPFLAGS" + AC_LANG_POP([C++]) + + AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) +fi AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms, From robertschuster at fsfe.org Tue May 19 07:22:19 2009 From: robertschuster at fsfe.org (Robert Schuster) Date: Tue, 19 May 2009 14:22:19 +0000 Subject: changeset in /hg/icedtea6: 2009-05-18 Robert Schuster changeset 723f9a6a6379 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=723f9a6a6379 description: 2009-05-18 Robert Schuster * configure.ac: Make xulrunner compilation check optional. diffstat: 2 files changed, 18 insertions(+), 12 deletions(-) ChangeLog | 4 ++++ configure.ac | 26 ++++++++++++++------------ diffs (54 lines): diff -r ea3bc7968a1c -r 723f9a6a6379 ChangeLog --- a/ChangeLog Tue May 19 15:08:12 2009 +0200 +++ b/ChangeLog Tue May 19 16:13:30 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-18 Robert Schuster + + * configure.ac: Make xulrunner compilation check optional. + 2009-05-18 Robert Schuster * Makefile.am: Corrected quoting of cross-compilation Makefile arguments. diff -r ea3bc7968a1c -r 723f9a6a6379 configure.ac --- a/configure.ac Tue May 19 15:08:12 2009 +0200 +++ b/configure.ac Tue May 19 16:13:30 2009 +0200 @@ -491,13 +491,15 @@ if test "x${enable_npplugin}" = "xyes" AC_SUBST(GTK_LIBS) fi -AC_LANG_PUSH([C++]) -OLDCPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" - -AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ +if test "x${enable_plugin}" = "xyes" -o "x${enable_npplugin}" = "xyes" +then + AC_LANG_PUSH([C++]) + OLDCPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" + + AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ #include #include #include @@ -534,11 +536,11 @@ return EXIT_SUCCESS; [AC_MSG_FAILURE([cannot determine xulrunner version])])], [xulrunner_cv_collapsed_version="190000"]) -CPPFLAGS="$OLDCPPFLAGS" -AC_LANG_POP([C++]) - -AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) - + CPPFLAGS="$OLDCPPFLAGS" + AC_LANG_POP([C++]) + + AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) +fi AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms, From thebohemian at gmx.net Tue May 19 07:24:56 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Tue, 19 May 2009 16:24:56 +0200 Subject: FYI: fix quoting Message-ID: <4A12C138.8030005@gmx.net> Hi, this patch fixes the quoting of the new cross-compilation arguments. The patch is committed to the trunk and the icedtea-1.5 release branch. 2009-05-18 Robert Schuster * Makefile.am: Corrected quoting of cross-compilation Makefile arguments. Regards Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-quoting.patch Type: text/x-patch Size: 557 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090519/fc3c2950/fix-quoting.patch -------------- 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/20090519/fc3c2950/signature.asc From thebohemian at gmx.net Tue May 19 07:26:18 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Tue, 19 May 2009 16:26:18 +0200 Subject: FYI: option xulrunner check Message-ID: <4A12C18A.1090505@gmx.net> Hi, the attached patch fixes the problem when the plugin support is disabled (PR 335[0]). It is applied to the icedtea6 trunk and the icedtea6-1.5 release branch. 2009-05-18 Robert Schuster * configure.ac: Make xulrunner compilation check optional. Regards Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: optional-xulrunner-check.patch Type: text/x-patch Size: 1219 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090519/1e64a138/optional-xulrunner-check.patch -------------- 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/20090519/1e64a138/signature.asc From bugzilla-daemon at icedtea.classpath.org Tue May 19 07:25:55 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 May 2009 14:25:55 +0000 Subject: [Bug 335] --disable-plugin makes ./configure fail Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=335 thebohemian at gmx.net changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #2 from thebohemian at gmx.net 2009-05-19 14:25 ------- Fixed in icedtea6 trunk and 1.5 release branch. -- 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 dbhole at redhat.com Tue May 19 07:56:17 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 19 May 2009 10:56:17 -0400 Subject: Patch to remove GCJ Web Plugin support In-Reply-To: <1242656253.20582.100.camel@hermans.wildebeest.org> References: <20090505211034.GA23367@redhat.com> <1242656253.20582.100.camel@hermans.wildebeest.org> Message-ID: <20090519145617.GB20166@redhat.com> * Mark Wielaard [2009-05-18 10:17]: > Hi Deepak, > > On Tue, 2009-05-05 at 17:10 -0400, Deepak Bhole wrote: > > Per the goals for 1.5, here is a patch that removes gcj web plugin > > support. > > > > ChangeLog: > > 2009-05-05 Deepak Bhole > > > > * Makefile.am: Remove GCJ Web Plugin support. > > * configure.ac: Ditto. > > I got slightly confused by this part of the change: > > -AC_MSG_CHECKING([whether to build the LiveConnect plugin]) > -AC_ARG_ENABLE([liveconnect], > - [AS_HELP_STRING([--disable-liveconnect], > +AC_MSG_CHECKING([whether to build the browser plugin]) > +AC_ARG_ENABLE([plugin], > + [AS_HELP_STRING([--disable-plugin], > > That renames the configure option from --enable-liveconnect to > --enable-plugin. If it was intentional to change the naming then please > do mention it in the the README and NEWS files (which both only mention > the --enable-liveconnect flag). > It was intentional. Lillian has taken care of updating the docs. Thanks Lillian! Deepak > Thanks, > > Mark > From dbhole at redhat.com Tue May 19 07:58:10 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 19 May 2009 10:58:10 -0400 Subject: RFC: xulrunner compilation check not optional In-Reply-To: <4A127C6F.8080403@gmx.net> References: <4A1167D8.4020601@gmx.net> <4A127C6F.8080403@gmx.net> Message-ID: <20090519145810.GC20166@redhat.com> * Robert Schuster [2009-05-19 05:31]: > Hi, > the former patch was not quite right. This one fixes the use of 'test' > and has better indentation. > Looks good to me. Please go ahead and commit. Thanks, Deepak > Regards > Robert > > Robert Schuster schrieb: > > Hi, > > current tip does not build if you disable plugin and npplugin since a > > check for the mozilla headers is compiled anyways. The attached patch > > (preliminary, needs better formatting) makes the check dependend on > > whether any of the plugins is enabled. > > > > I am also not 100% sure if it is right. Maybe xulrunner is also needed > > for other stuff. > > > > I talked to Mark on IRC about this and was asked to post the patch here. > > > > Regards > > Robert > > > From bugzilla-daemon at icedtea.classpath.org Tue May 19 08:50:57 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 May 2009 15:50:57 +0000 Subject: [Bug 336] New: Add support for JSR-200 to javaws and appletviewer Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=336 Summary: Add support for JSR-200 to javaws and appletviewer Product: IcedTea Version: unspecified Platform: PC OS/Version: All Status: NEW Severity: enhancement Priority: P3 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: devon.c.miller at gmail.com Please add support for JSR-200 to the applet viewer and web start. Currently support is there for the pack200 and unpack200 command line programs, and rt.jar contains java.util.jar.Pack200. However neither appletviewer nor webstart (javaws) support Pack200 encoded jars. These can offer substantial bandwidth savings. Last project I used Pack200 on it reduced the size of the download by 75%. -- 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 Wed May 20 08:31:46 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 20 May 2009 16:31:46 +0100 Subject: Zero/Shark Message-ID: <17c6771e0905200831g64b19b8fibc710d9c57ec6e30@mail.gmail.com> New recording from FOSDEM 2009: http://www.archive.org/download/fosdem_2009_free_java_zero_shark/ Full set of recordings with links to movies and slides @ http://fuseyism.com/#movies -- 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 ahughes at redhat.com Wed May 20 11:26:41 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:26:41 +0000 Subject: changeset in /hg/icedtea: Shark merge. Message-ID: changeset 550ad0a98afb in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=550ad0a98afb description: Shark merge. 2009-03-23 Gary Benson * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: (SharkFunction::_deferred_zero_checks): New field. (SharkFunction::deferred_zero_checks): New method. (SharkFunction::add_deferred_zero_check): Likewise. (SharkFunction::do_deferred_zero_checks): Likewise. * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: (SharkFunction::DeferredZeroCheck): New class. (SharkFunction::add_deferred_zero_check): New method. (SharkFunction::do_deferred_zero_checks): Likewise. (SharkFunction::initialize): Do deferred zero checks after parsing blocks. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkBlock::zero_check_value): New method. (SharkBlock::do_deferred_zero_check): Likewise. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkBlock::do_zero_check): Defer ambiguous zero checks. (SharkBlock::zero_check_value): New method. (SharkBlock::do_deferred_zero_check): Likewise. (SharkTopLevelBlock::handle_exception): Don't copy state. (SharkTopLevelBlock::do_if): Likewise. (SharkTopLevelBlock::do_switch): Likewise. * ports/hotspot/src/share/vm/shark/sharkValue.hpp (SharkPHIValue): New class. (SharkValue::is_phi): New method. (SharkValue::as_phi): Likewise. (SharkValue::create_phi): Likewise. (SharkValue::merge): Likewise. (SharkNormalValue::merge): Likewise. (SharkAddressValue::merge): Likewise. * ports/hotspot/src/share/vm/shark/sharkState.cpp (SharkPHIState::SharkPHIState): Create SharkPHIValues. (SharkState::merge): Defer to SharkValue::merge. diffstat: 8 files changed, 400 insertions(+), 117 deletions(-) ChangeLog | 38 +++ ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 78 ++++++ ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 37 ++- ports/hotspot/src/share/vm/shark/sharkState.cpp | 57 +--- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 57 +++- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 12 - ports/hotspot/src/share/vm/shark/sharkValue.cpp | 65 +++++ ports/hotspot/src/share/vm/shark/sharkValue.hpp | 173 +++++++++++---- diffs (truncated from 756 to 500 lines): diff -r 8cf23c220172 -r 550ad0a98afb ChangeLog --- a/ChangeLog Tue May 19 02:32:56 2009 +0100 +++ b/ChangeLog Tue May 19 15:55:38 2009 +0100 @@ -1,3 +1,41 @@ 2009-05-19 Andrew John Hughes + + * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: + (SharkFunction::_deferred_zero_checks): New field. + (SharkFunction::deferred_zero_checks): New method. + (SharkFunction::add_deferred_zero_check): Likewise. + (SharkFunction::do_deferred_zero_checks): Likewise. + * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: + (SharkFunction::DeferredZeroCheck): New class. + (SharkFunction::add_deferred_zero_check): New method. + (SharkFunction::do_deferred_zero_checks): Likewise. + (SharkFunction::initialize): Do deferred zero checks + after parsing blocks. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkBlock::zero_check_value): New method. + (SharkBlock::do_deferred_zero_check): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkBlock::do_zero_check): Defer ambiguous zero checks. + (SharkBlock::zero_check_value): New method. + (SharkBlock::do_deferred_zero_check): Likewise. + (SharkTopLevelBlock::handle_exception): Don't copy state. + (SharkTopLevelBlock::do_if): Likewise. + (SharkTopLevelBlock::do_switch): Likewise. + + * ports/hotspot/src/share/vm/shark/sharkValue.hpp + (SharkPHIValue): New class. + (SharkValue::is_phi): New method. + (SharkValue::as_phi): Likewise. + (SharkValue::create_phi): Likewise. + (SharkValue::merge): Likewise. + (SharkNormalValue::merge): Likewise. + (SharkAddressValue::merge): Likewise. + + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkPHIState::SharkPHIState): Create SharkPHIValues. + (SharkState::merge): Defer to SharkValue::merge. + 2009-05-19 Andrew John Hughes * Makefile.am: diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkFunction.cpp --- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Tue May 19 02:32:56 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Tue May 19 15:55:38 2009 +0100 @@ -123,6 +123,7 @@ void SharkFunction::initialize() block(i)->emit_IR(); } + do_deferred_zero_checks(); // Dump the bitcode, if requested if (SharkPrintBitcodeOf != NULL) { @@ -307,3 +308,80 @@ SharkMonitor* SharkFunction::monitor(Val this, builder()->CreateGEP(monitors_slots(), indexes, indexes + 2)); } + +class DeferredZeroCheck : public ResourceObj { + public: + DeferredZeroCheck(SharkTopLevelBlock* block, SharkValue* value) + : _block(block), + _value(value), + _bci(block->bci()), + _state(block->current_state()->copy()), + _check_block(builder()->GetInsertBlock()), + _continue_block(function()->CreateBlock("not_zero")) + { + builder()->SetInsertPoint(continue_block()); + } + + private: + SharkTopLevelBlock* _block; + SharkValue* _value; + int _bci; + SharkState* _state; + BasicBlock* _check_block; + BasicBlock* _continue_block; + + public: + SharkTopLevelBlock* block() const + { + return _block; + } + SharkValue* value() const + { + return _value; + } + int bci() const + { + return _bci; + } + SharkState* state() const + { + return _state; + } + BasicBlock* check_block() const + { + return _check_block; + } + BasicBlock* continue_block() const + { + return _continue_block; + } + + public: + SharkBuilder* builder() const + { + return block()->builder(); + } + SharkFunction* function() const + { + return block()->function(); + } + + public: + void process() const + { + builder()->SetInsertPoint(check_block()); + block()->do_deferred_zero_check(value(), bci(), state(), continue_block()); + } +}; + +void SharkFunction::add_deferred_zero_check(SharkTopLevelBlock* block, + SharkValue* value) +{ + deferred_zero_checks()->append(new DeferredZeroCheck(block, value)); +} + +void SharkFunction::do_deferred_zero_checks() +{ + for (int i = 0; i < deferred_zero_checks()->length(); i++) + deferred_zero_checks()->at(i)->process(); +} diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkFunction.hpp --- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Tue May 19 02:32:56 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Tue May 19 15:55:38 2009 +0100 @@ -23,8 +23,10 @@ * */ +class SharkMonitor; class SharkTopLevelBlock; -class SharkMonitor; + +class DeferredZeroCheck; class SharkFunction : public StackObj { public: @@ -44,16 +46,17 @@ class SharkFunction : public StackObj { void initialize(); private: - SharkCompiler* _compiler; - const char* _name; - ciTypeFlow* _flow; - ciBytecodeStream* _iter; - MacroAssembler* _masm; - llvm::Function* _function; - SharkTopLevelBlock** _blocks; - llvm::Value* _base_pc; - llvm::Value* _thread; - int _monitor_count; + SharkCompiler* _compiler; + const char* _name; + ciTypeFlow* _flow; + ciBytecodeStream* _iter; + MacroAssembler* _masm; + llvm::Function* _function; + SharkTopLevelBlock** _blocks; + llvm::Value* _base_pc; + llvm::Value* _thread; + int _monitor_count; + GrowableArray _deferred_zero_checks; public: SharkCompiler* compiler() const @@ -95,6 +98,10 @@ class SharkFunction : public StackObj { int monitor_count() const { return _monitor_count; + } + GrowableArray* deferred_zero_checks() + { + return &_deferred_zero_checks; } public: @@ -333,4 +340,12 @@ class SharkFunction : public StackObj { builder()->CreateStore(LLVMValue::null(), addr); return result; } + + // Deferred zero checks + public: + void add_deferred_zero_check(SharkTopLevelBlock* block, + SharkValue* value); + + private: + void do_deferred_zero_checks(); }; diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkState.cpp --- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Tue May 19 02:32:56 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Tue May 19 15:55:38 2009 +0100 @@ -130,14 +130,11 @@ void SharkState::merge(SharkState* other BasicBlock* other_block, BasicBlock* this_block) { - PHINode *phi; - char name[18]; - // Method Value *this_method = this->method(); Value *other_method = other->method(); if (this_method != other_method) { - phi = builder()->CreatePHI(SharkType::methodOop_type(), "method"); + PHINode *phi = builder()->CreatePHI(SharkType::methodOop_type(), "method"); phi->addIncoming(this_method, this_block); phi->addIncoming(other_method, other_block); set_method(phi); @@ -149,20 +146,12 @@ void SharkState::merge(SharkState* other SharkValue *this_value = this->local(i); SharkValue *other_value = other->local(i); assert((this_value == NULL) == (other_value == NULL), "should be"); - if (this_value == other_value) - continue; - - ciType *this_type = this_value->type(); - assert(this_type == other_value->type(), "should be"); - - bool this_checked = this_value->zero_checked(); - assert(this_checked == other_value->zero_checked(), "should be"); - - snprintf(name, sizeof(name), "local_%d_", i); - phi = builder()->CreatePHI(SharkType::to_stackType(this_type), name); - phi->addIncoming(this_value->generic_value(), this_block); - phi->addIncoming(other_value->generic_value(), other_block); - set_local(i, SharkValue::create_generic(this_type, phi, this_checked)); + if (this_value != NULL) { + char name[18]; + snprintf(name, sizeof(name), "local_%d_", i); + set_local(i, this_value->merge( + builder(), other_value, other_block, this_block, name)); + } } // Expression stack @@ -171,20 +160,12 @@ void SharkState::merge(SharkState* other SharkValue *this_value = this->stack(i); SharkValue *other_value = other->stack(i); assert((this_value == NULL) == (other_value == NULL), "should be"); - if (this_value == other_value) - continue; - - ciType *this_type = this_value->type(); - assert(this_type == other_value->type(), "should be"); - - bool this_checked = this_value->zero_checked(); - assert(this_checked == other_value->zero_checked(), "should be"); - - snprintf(name, sizeof(name), "stack_%d_", i); - phi = builder()->CreatePHI(SharkType::to_stackType(this_type), name); - phi->addIncoming(this_value->generic_value(), this_block); - phi->addIncoming(other_value->generic_value(), other_block); - set_stack(i, SharkValue::create_generic(this_type, phi, this_checked)); + if (this_value != NULL) { + char name[18]; + snprintf(name, sizeof(name), "stack_%d_", i); + set_stack(i, this_value->merge( + builder(), other_value, other_block, this_block, name)); + } } } @@ -315,10 +296,8 @@ SharkPHIState::SharkPHIState(SharkTopLev case T_OBJECT: case T_ARRAY: snprintf(name, sizeof(name), "local_%d_", i); - value = SharkValue::create_generic( - type, - builder()->CreatePHI(SharkType::to_stackType(type), name), - false); + value = SharkValue::create_phi( + type, builder()->CreatePHI(SharkType::to_stackType(type), name)); break; case T_ADDRESS: @@ -355,10 +334,8 @@ SharkPHIState::SharkPHIState(SharkTopLev case T_OBJECT: case T_ARRAY: snprintf(name, sizeof(name), "stack_%d_", i); - value = SharkValue::create_generic( - type, - builder()->CreatePHI(SharkType::to_stackType(type), name), - false); + value = SharkValue::create_phi( + type, builder()->CreatePHI(SharkType::to_stackType(type), name)); break; case T_ADDRESS: diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Tue May 19 02:32:56 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Tue May 19 15:55:38 2009 +0100 @@ -250,8 +250,40 @@ SharkTopLevelBlock* SharkTopLevelBlock:: void SharkTopLevelBlock::do_zero_check(SharkValue *value) { - BasicBlock *zero = function()->CreateBlock("zero"); - BasicBlock *not_zero = function()->CreateBlock("not_zero"); + if (value->is_phi() && value->as_phi()->all_incomers_zero_checked()) { + function()->add_deferred_zero_check(this, value); + } + else { + BasicBlock *continue_block = function()->CreateBlock("not_zero"); + SharkState *saved_state = current_state(); + set_current_state(saved_state->copy()); + zero_check_value(value, continue_block); + builder()->SetInsertPoint(continue_block); + set_current_state(saved_state); + } + + value->set_zero_checked(true); +} + +void SharkTopLevelBlock::do_deferred_zero_check(SharkValue* value, + int bci, + SharkState* saved_state, + BasicBlock* continue_block) +{ + if (value->as_phi()->all_incomers_zero_checked()) { + builder()->CreateBr(continue_block); + } + else { + iter()->force_bci(start()); + set_current_state(saved_state); + zero_check_value(value, continue_block); + } +} + +void SharkTopLevelBlock::zero_check_value(SharkValue* value, + BasicBlock* continue_block) +{ + BasicBlock *zero_block = builder()->CreateBlock(continue_block, "zero"); Value *a, *b; switch (value->basic_type()) { @@ -276,10 +308,10 @@ void SharkTopLevelBlock::do_zero_check(S ShouldNotReachHere(); } - builder()->CreateCondBr(builder()->CreateICmpNE(a, b), not_zero, zero); - - builder()->SetInsertPoint(zero); - SharkState *saved_state = current_state()->copy(); + builder()->CreateCondBr( + builder()->CreateICmpNE(a, b), continue_block, zero_block); + + builder()->SetInsertPoint(zero_block); if (value->is_jobject()) { call_vm_nocheck( SharkRuntime::throw_NullPointerException(), @@ -290,11 +322,6 @@ void SharkTopLevelBlock::do_zero_check(S builder()->CreateUnimplemented(__FILE__, __LINE__); } handle_exception(function()->CreateGetPendingException()); - set_current_state(saved_state); - - builder()->SetInsertPoint(not_zero); - - value->set_zero_checked(true); } void SharkTopLevelBlock::check_bounds(SharkValue* array, SharkValue* index) @@ -402,7 +429,7 @@ void SharkTopLevelBlock::handle_exceptio LLVMValue::jint_constant(i), handler->entry_block()); - handler->add_incoming(current_state()->copy()); + handler->add_incoming(current_state()); } builder()->SetInsertPoint(no_handler); @@ -776,8 +803,6 @@ void SharkTopLevelBlock::do_ret() // All propagation of state from one block to the next (via // dest->add_incoming) is handled by the next three methods // (do_branch, do_if and do_switch) and by handle_exception. -// Where control flow forks, each successor must have its -// own copy of the state. void SharkTopLevelBlock::do_branch(int successor_index) { @@ -808,7 +833,7 @@ void SharkTopLevelBlock::do_if(ICmpInst: if_taken->entry_block(), not_taken->entry_block()); if_taken->add_incoming(current_state()); - not_taken->add_incoming(current_state()->copy()); + not_taken->add_incoming(current_state()); } void SharkTopLevelBlock::do_switch() @@ -827,7 +852,7 @@ void SharkTopLevelBlock::do_switch() switchinst->addCase( LLVMValue::jint_constant(switch_key(i)), dest_block->entry_block()); - dest_block->add_incoming(current_state()->copy()); + dest_block->add_incoming(current_state()); } } } diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Tue May 19 02:32:56 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Tue May 19 15:55:38 2009 +0100 @@ -185,10 +185,20 @@ class SharkTopLevelBlock : public SharkB // Helpers private: - void do_zero_check(SharkValue* value); llvm::Value* lookup_for_ldc(); llvm::Value* lookup_for_field_access(); void do_branch(int successor_index); + + // Zero checks + private: + void do_zero_check(SharkValue* value); + void zero_check_value(SharkValue* value, llvm::BasicBlock* continue_block); + + public: + void do_deferred_zero_check(SharkValue* value, + int bci, + SharkState* saved_state, + llvm::BasicBlock* continue_block); // VM calls private: diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkValue.cpp --- a/ports/hotspot/src/share/vm/shark/sharkValue.cpp Tue May 19 02:32:56 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkValue.cpp Tue May 19 15:55:38 2009 +0100 @@ -34,9 +34,32 @@ SharkValue* SharkNormalValue::clone() co { return SharkValue::create_generic(type(), generic_value(), zero_checked()); } +SharkValue* SharkPHIValue::clone() const +{ + return SharkValue::create_phi(type(), (PHINode *) generic_value(), this); +} SharkValue* SharkAddressValue::clone() const { return SharkValue::address_constant(address_value()); +} + +// Casting + +bool SharkValue::is_phi() const +{ + return false; +} +bool SharkPHIValue::is_phi() const +{ + return true; +} +SharkPHIValue* SharkValue::as_phi() +{ + ShouldNotCallThis(); +} +SharkPHIValue* SharkPHIValue::as_phi() +{ + return this; } // Comparison @@ -225,19 +248,51 @@ Value* SharkNormalValue::intptr_value(Sh return builder->CreatePtrToInt(jobject_value(), SharkType::intptr_type()); } -// Phi-style stuff - -void SharkNormalValue::addIncoming(SharkValue *value, BasicBlock* block) -{ - assert(llvm::isa(generic_value()), "should be"); +// Phi-style stuff for SharkPHIState::add_incoming + +void SharkValue::addIncoming(SharkValue *value, BasicBlock* block) +{ + ShouldNotCallThis(); +} +void SharkPHIValue::addIncoming(SharkValue *value, BasicBlock* block) +{ + assert(!is_clone(), "shouldn't be"); ((llvm::PHINode *) generic_value())->addIncoming( value->generic_value(), block); + if (!value->zero_checked()) + _all_incomers_zero_checked = false; } void SharkAddressValue::addIncoming(SharkValue *value, BasicBlock* block) { assert(this->equal_to(value), "should be"); } From xerxes at zafena.se Wed May 20 11:26:41 2009 From: xerxes at zafena.se (Xerxes R?nby) Date: Wed, 20 May 2009 18:26:41 +0000 Subject: changeset in /hg/icedtea: 2009-04-23 Xerxes R?nby changeset c684dfb2d94f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c684dfb2d94f description: 2009-04-23 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (zero_cmpxchg_int_fn): New function. (zero_cmpxchg_ptr_fn): Likewise. (SharkBuilder::init_external_functions): Use the above on arm. diffstat: 1 file changed, 46 insertions(+) ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 46 +++++++++++++++++++++ diffs (73 lines): diff -r 550ad0a98afb -r c684dfb2d94f ports/hotspot/src/share/vm/shark/sharkBuilder.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Tue May 19 15:55:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Apr 23 16:57:41 2009 +0200 @@ -28,6 +28,38 @@ using namespace llvm; +#ifdef ARM +/* + * ARM lacks atomic operation implementation in LLVM + * http://llvm.org/bugs/show_bug.cgi?id=3877 + * + * These two functions zero_cmpxchg_int_fn and zero_cmpxchg_ptr_fn + * are defined so that they can be inserted into llvm as a workaround to + * make shark reroute all atomic calls back to the implementation in zero. + * The actual insertion are done in SharkBuilder::init_external_functions(). + */ + +extern "C" { + jint zero_cmpxchg_int_fn(volatile jint *ptr, + jint *oldval, + jint *newval) + { + return Atomic::cmpxchg(*newval, + ptr, + *oldval); + } + + intptr_t* zero_cmpxchg_ptr_fn(volatile void* ptr, + intptr_t* oldval, + intptr_t* newval) + { + return (intptr_t *) Atomic::cmpxchg_ptr((void *) newval, + ptr, + (void *) oldval); + } +}; +#endif + SharkBuilder::SharkBuilder(SharkCompiler* compiler) : IRBuilder<>(), _compiler(compiler) @@ -81,7 +113,14 @@ void SharkBuilder::init_external_functio params.push_back(SharkType::jint_type()); type = FunctionType::get(SharkType::jint_type(), params, false); set_llvm_cmpxchg_int_fn( +#ifdef ARM + make_function( + (intptr_t) zero_cmpxchg_int_fn, + type, + "zero_cmpxchg_int_fn")); +#else module()->getOrInsertFunction("llvm.atomic.cmp.swap.i32", type)); +#endif params.clear(); params.push_back(PointerType::getUnqual(SharkType::intptr_type())); @@ -89,8 +128,15 @@ void SharkBuilder::init_external_functio params.push_back(SharkType::intptr_type()); type = FunctionType::get(SharkType::intptr_type(), params, false); set_llvm_cmpxchg_ptr_fn( +#ifdef ARM + make_function( + (intptr_t) zero_cmpxchg_ptr_fn, + type, + "zero_cmpxchg_ptr_fn")); +#else module()->getOrInsertFunction( "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32"), type)); +#endif params.clear(); for (int i = 0; i < 5; i++) From ahughes at redhat.com Wed May 20 11:26:41 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:26:41 +0000 Subject: changeset in /hg/icedtea: Add ChangeLog entry for last commit. Message-ID: changeset e8364b501de4 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e8364b501de4 description: Add ChangeLog entry for last commit. diffstat: 1 file changed, 7 insertions(+) ChangeLog | 7 +++++++ diffs (14 lines): diff -r c684dfb2d94f -r e8364b501de4 ChangeLog --- a/ChangeLog Thu Apr 23 16:57:41 2009 +0200 +++ b/ChangeLog Tue May 19 15:58:51 2009 +0100 @@ -1,3 +1,10 @@ 2009-03-23 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (zero_cmpxchg_int_fn): New function. + (zero_cmpxchg_ptr_fn): Likewise. + (SharkBuilder::init_external_functions): Use the above on arm. + 2009-03-23 Gary Benson * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: From xerxes at zafena.se Wed May 20 11:26:42 2009 From: xerxes at zafena.se (Xerxes R?nby) Date: Wed, 20 May 2009 18:26:42 +0000 Subject: changeset in /hg/icedtea: 2009-04-23 Xerxes R?nby changeset 28c8fa90206c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=28c8fa90206c description: 2009-04-23 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::init_external_functions): Use memory address to kernel helper __kernel_dmb on arm for memory barrier. * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp (__kernel_dmb_t): New type. (__kernel_dmb): New macro. (FULL_MEM_BARRIER): New macro that uses __kernel_dmb on arm and __sync_synchronize on all other architectures. (READ_MEM_BARRIER): Updated to use __kernel_dmb on arm. (WRITE_MEM_BARRIER): Likewise. (OrderAccess::fence): Updated to use FULL_MEM_BARRIER. diffstat: 3 files changed, 49 insertions(+), 1 deletion(-) ChangeLog | 14 ++++++ ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 22 +++++++++- ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 14 ++++++ diffs (97 lines): diff -r e8364b501de4 -r 28c8fa90206c ChangeLog --- a/ChangeLog Tue May 19 15:58:51 2009 +0100 +++ b/ChangeLog Thu Apr 23 16:59:47 2009 +0200 @@ -1,3 +1,17 @@ 2009-04-23 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::init_external_functions): Use memory address to + kernel helper __kernel_dmb on arm for memory barrier. + * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp + (__kernel_dmb_t): New type. + (__kernel_dmb): New macro. + (FULL_MEM_BARRIER): New macro that uses __kernel_dmb on arm + and __sync_synchronize on all other architectures. + (READ_MEM_BARRIER): Updated to use __kernel_dmb on arm. + (WRITE_MEM_BARRIER): Likewise. + (OrderAccess::fence): Updated to use FULL_MEM_BARRIER. + 2009-04-23 Xerxes R??nby * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp diff -r e8364b501de4 -r 28c8fa90206c ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp --- a/ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp Tue May 19 15:58:51 2009 +0100 +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp Thu Apr 23 16:59:47 2009 +0200 @@ -23,6 +23,25 @@ * */ +#ifdef ARM + +/* + * ARM Kernel helper for memory barrier. + * Using __asm __volatile ("":::"memory") does not work reliable on ARM + * and gcc __sync_synchronize(); implementation does not use the kernel + * helper for all gcc versions so it is unreliable to use as well. + */ +typedef void (__kernel_dmb_t) (void); +#define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0) + +#define FULL_MEM_BARRIER __kernel_dmb() +#define READ_MEM_BARRIER __kernel_dmb() +#define WRITE_MEM_BARRIER __kernel_dmb() + +#else // ARM + +#define FULL_MEM_BARRIER __sync_synchronize() + #ifdef PPC #define READ_MEM_BARRIER __asm __volatile ("isync":::"memory") @@ -39,6 +58,7 @@ #endif // PPC +#endif // ARM inline void OrderAccess::loadload() { acquire(); } @@ -58,7 +78,7 @@ inline void OrderAccess::release() inline void OrderAccess::fence() { - __sync_synchronize(); + FULL_MEM_BARRIER; } inline jbyte OrderAccess::load_acquire(volatile jbyte* p) { jbyte data = *p; acquire(); return data; } diff -r e8364b501de4 -r 28c8fa90206c ports/hotspot/src/share/vm/shark/sharkBuilder.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Tue May 19 15:58:51 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Apr 23 16:59:47 2009 +0200 @@ -138,12 +138,26 @@ void SharkBuilder::init_external_functio "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32"), type)); #endif + /* + * The five booleans passed to llvm.memory.barrier are used like this: + * The first four arguments enables a specific barrier in this order: + * load-load, load-store, store-load and store-store. + * The fith argument specifies that the barrier applies to io or device + * or uncached memory. + */ params.clear(); for (int i = 0; i < 5; i++) params.push_back(Type::Int1Ty); type = FunctionType::get(Type::VoidTy, params, false); set_llvm_memory_barrier_fn( +#ifdef ARM + make_function( + 0xffff0fa0, // __kernel_dmb + type, + "__kernel_dmb")); +#else module()->getOrInsertFunction("llvm.memory.barrier", type)); +#endif params.clear(); params.push_back(SharkType::jdouble_type()); From gbenson at redhat.com Wed May 20 11:26:42 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 20 May 2009 18:26:42 +0000 Subject: changeset in /hg/icedtea: 2009-04-27 Gary Benson changeset ee08e16e223e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee08e16e223e description: 2009-04-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkState.hpp (SharkState::SharkState): Add explicit block argument. (SharkState::copy): Pass block to constructor. * ports/hotspot/src/share/vm/shark/sharkState.cpp (SharkState::SharkState): Add explicit block argument. * ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::initial_current_state): Pass block to SharkState constructor. diffstat: 4 files changed, 16 insertions(+), 5 deletions(-) ChangeLog | 11 +++++++++++ ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 2 +- ports/hotspot/src/share/vm/shark/sharkState.cpp | 4 ++-- ports/hotspot/src/share/vm/shark/sharkState.hpp | 4 ++-- diffs (65 lines): diff -r 28c8fa90206c -r ee08e16e223e ChangeLog --- a/ChangeLog Thu Apr 23 16:59:47 2009 +0200 +++ b/ChangeLog Mon Apr 27 05:35:03 2009 -0400 @@ -1,3 +1,14 @@ 2009-04-23 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkState.hpp + (SharkState::SharkState): Add explicit block argument. + (SharkState::copy): Pass block to constructor. + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkState::SharkState): Add explicit block argument. + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp + (SharkBlock::initial_current_state): Pass block to + SharkState constructor. + 2009-04-23 Xerxes R??nby * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp diff -r 28c8fa90206c -r ee08e16e223e ports/hotspot/src/share/vm/shark/sharkBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Thu Apr 23 16:59:47 2009 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Mon Apr 27 05:35:03 2009 -0400 @@ -853,7 +853,7 @@ void SharkBlock::parse_bytecode(int star SharkState* SharkBlock::initial_current_state() { - return new SharkState(entry_state()); + return new SharkState(this, entry_state()); } int SharkBlock::switch_default_dest() diff -r 28c8fa90206c -r ee08e16e223e ports/hotspot/src/share/vm/shark/sharkState.cpp --- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Thu Apr 23 16:59:47 2009 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Mon Apr 27 05:35:03 2009 -0400 @@ -38,8 +38,8 @@ SharkState::SharkState(SharkBlock* bl initialize(NULL); } -SharkState::SharkState(const SharkState* state) - : _block(state->block()), +SharkState::SharkState(SharkBlock* block, const SharkState* state) + : _block(block), _function(state->function()), _method(state->method()) { diff -r 28c8fa90206c -r ee08e16e223e ports/hotspot/src/share/vm/shark/sharkState.hpp --- a/ports/hotspot/src/share/vm/shark/sharkState.hpp Thu Apr 23 16:59:47 2009 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkState.hpp Mon Apr 27 05:35:03 2009 -0400 @@ -32,7 +32,7 @@ class SharkState : public ResourceObj { SharkState(SharkBlock* block, SharkFunction* function = NULL, llvm::Value* method = NULL); - SharkState(const SharkState* state); + SharkState(SharkBlock* block, const SharkState* state); private: void initialize(const SharkState* state); @@ -137,7 +137,7 @@ class SharkState : public ResourceObj { public: SharkState* copy() const { - return new SharkState(this); + return new SharkState(block(), this); } void merge(SharkState* other, llvm::BasicBlock* other_block, From gbenson at redhat.com Wed May 20 11:26:43 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 20 May 2009 18:26:43 +0000 Subject: changeset in /hg/icedtea: 2009-04-27 Gary Benson changeset eaa4c58a52a4 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=eaa4c58a52a4 description: 2009-04-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkBlock.hpp (SharkBlock::has_trap): New method. (SharkBlock::trap_request): Likewise. (SharkBlock::trap_bci): Likewise. (SharkBlock::do_trap): Likewise. * ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::has_trap): New method. (SharkBlock::trap_request): Likewise. (SharkBlock::trap_bci): Likewise. (SharkBlock::do_trap): Likewise. (SharkBlock::parse_bytecode): Handle traps. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::_has_trap): New field. (SharkTopLevelBlock::_trap_bci): Likewise. (SharkTopLevelBlock::has-trap): Updated. (SharkTopLevelBlock::trap_request): Likewise. (SharkTopLevelBlock::set_trap): New method. (SharkTopLevelBlock::trap_bci): Likewise. (SharkTopLevelBlock::do_trap): Likewise. (SharkTopLevelBlock::scan_for_traps): New prototype. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::scan_for_traps): Store trap_bci along with trap_request, and don't assume that traps found by typeflow are the first traps in the block. (SharkTopLevelBlock::enter): Scan for traps, and always enter exception sucessors. (SharkTopLevelBlock::emit_IR): Remove old trap handling. (SharkTopLevelBlock::do_trap): New method. diffstat: 5 files changed, 141 insertions(+), 56 deletions(-) ChangeLog | 31 +++++ ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 25 ++++ ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 7 + ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 86 ++++++++------- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 48 +++++--- diffs (325 lines): diff -r ee08e16e223e -r eaa4c58a52a4 ChangeLog --- a/ChangeLog Mon Apr 27 05:35:03 2009 -0400 +++ b/ChangeLog Mon Apr 27 07:13:07 2009 -0400 @@ -1,3 +1,34 @@ 2009-04-27 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkBlock.hpp + (SharkBlock::has_trap): New method. + (SharkBlock::trap_request): Likewise. + (SharkBlock::trap_bci): Likewise. + (SharkBlock::do_trap): Likewise. + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp + (SharkBlock::has_trap): New method. + (SharkBlock::trap_request): Likewise. + (SharkBlock::trap_bci): Likewise. + (SharkBlock::do_trap): Likewise. + (SharkBlock::parse_bytecode): Handle traps. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::_has_trap): New field. + (SharkTopLevelBlock::_trap_bci): Likewise. + (SharkTopLevelBlock::has-trap): Updated. + (SharkTopLevelBlock::trap_request): Likewise. + (SharkTopLevelBlock::set_trap): New method. + (SharkTopLevelBlock::trap_bci): Likewise. + (SharkTopLevelBlock::do_trap): Likewise. + (SharkTopLevelBlock::scan_for_traps): New prototype. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::scan_for_traps): Store trap_bci along + with trap_request, and don't assume that traps found by + typeflow are the first traps in the block. + (SharkTopLevelBlock::enter): Scan for traps, and always + enter exception sucessors. + (SharkTopLevelBlock::emit_IR): Remove old trap handling. + (SharkTopLevelBlock::do_trap): New method. + 2009-04-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkState.hpp diff -r ee08e16e223e -r eaa4c58a52a4 ports/hotspot/src/share/vm/shark/sharkBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Mon Apr 27 05:35:03 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Mon Apr 27 07:13:07 2009 -0400 @@ -46,6 +46,11 @@ void SharkBlock::parse_bytecode(int star if (SharkTraceBytecodes) tty->print_cr("%4d: %s", bci(), Bytecodes::name(bc())); + if (has_trap() && trap_bci() == bci()) { + do_trap(trap_request()); + return; + } + if (UseLoopSafepoints) { // XXX if a lcmp is followed by an if_?? then C2 maybe-inserts // the safepoint before the lcmp rather than before the if. @@ -1138,6 +1143,26 @@ void SharkBlock::add_safepoint() ShouldNotCallThis(); } +bool SharkBlock::has_trap() +{ + return false; +} + +int SharkBlock::trap_request() +{ + ShouldNotCallThis(); +} + +int SharkBlock::trap_bci() +{ + ShouldNotCallThis(); +} + +void SharkBlock::do_trap(int trap_request) +{ + ShouldNotCallThis(); +} + Value* SharkBlock::lookup_for_ldc() { ShouldNotCallThis(); diff -r ee08e16e223e -r eaa4c58a52a4 ports/hotspot/src/share/vm/shark/sharkBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Mon Apr 27 05:35:03 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Mon Apr 27 07:13:07 2009 -0400 @@ -233,6 +233,13 @@ class SharkBlock : public ResourceObj { protected: virtual void add_safepoint(); + // Traps + protected: + virtual bool has_trap(); + virtual int trap_request(); + virtual int trap_bci(); + virtual void do_trap(int trap_request); + // ldc* private: void do_ldc() diff -r ee08e16e223e -r eaa4c58a52a4 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Mon Apr 27 05:35:03 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Mon Apr 27 07:13:07 2009 -0400 @@ -28,19 +28,14 @@ using namespace llvm; -int SharkTopLevelBlock::scan_for_traps() -{ - // If typeflow got one then we're already done - if (ciblock()->has_trap()) { - return Deoptimization::make_trap_request( - Deoptimization::Reason_unloaded, - Deoptimization::Action_reinterpret, - ciblock()->trap_index()); - } - - // Scan the bytecode +void SharkTopLevelBlock::scan_for_traps() +{ + // If typeflow found a trap then don't scan past it + int limit_bci = ciblock()->has_trap() ? ciblock()->trap_bci() : limit(); + + // Scan the bytecode for traps that are always hit iter()->reset_to_bci(start()); - while (iter()->next_bci() < limit()) { + while (iter()->next_bci() < limit_bci) { iter()->next(); ciField *field; @@ -62,9 +57,11 @@ int SharkTopLevelBlock::scan_for_traps() // If the bytecode does not match the field then bail out to // the interpreter to throw an IncompatibleClassChangeError if (is_field == field->is_static()) { - return Deoptimization::make_trap_request( - Deoptimization::Reason_unhandled, - Deoptimization::Action_none); + set_trap( + Deoptimization::make_trap_request( + Deoptimization::Reason_unhandled, + Deoptimization::Action_none), bci()); + return; } // If this is a getfield or putfield then there won't be a @@ -96,9 +93,11 @@ int SharkTopLevelBlock::scan_for_traps() // set up otherwise. if (bc() == Bytecodes::_invokevirtual && !method->is_final_method()) { if (!method->holder()->is_linked()) { - return Deoptimization::make_trap_request( - Deoptimization::Reason_uninitialized, - Deoptimization::Action_reinterpret); + set_trap( + Deoptimization::make_trap_request( + Deoptimization::Reason_uninitialized, + Deoptimization::Action_reinterpret), bci()); + return; } break; } @@ -112,13 +111,24 @@ int SharkTopLevelBlock::scan_for_traps() if (index != -1) { if (!target()->holder()->is_cache_entry_resolved( Bytes::swap_u2(index), bc())) { - return Deoptimization::make_trap_request( - Deoptimization::Reason_uninitialized, - Deoptimization::Action_reinterpret); + set_trap( + Deoptimization::make_trap_request( + Deoptimization::Reason_uninitialized, + Deoptimization::Action_reinterpret), bci()); + return; } } } - return TRAP_NO_TRAPS; + + // Trap if typeflow trapped (and we didn't before) + if (ciblock()->has_trap()) { + set_trap( + Deoptimization::make_trap_request( + Deoptimization::Reason_unloaded, + Deoptimization::Action_reinterpret, + ciblock()->trap_index()), ciblock()->trap_bci()); + return; + } } SharkState* SharkTopLevelBlock::entry_state() @@ -163,13 +173,14 @@ void SharkTopLevelBlock::enter(SharkTopL if (!entered()) { _entered = true; + scan_for_traps(); if (!has_trap()) { for (int i = 0; i < num_successors(); i++) { successor(i)->enter(this, false); } - for (int i = 0; i < num_exceptions(); i++) { - exception(i)->enter(this, true); - } + } + for (int i = 0; i < num_exceptions(); i++) { + exception(i)->enter(this, true); } } } @@ -215,25 +226,12 @@ void SharkTopLevelBlock::emit_IR() { builder()->SetInsertPoint(entry_block()); - // Handle traps - if (has_trap()) { - iter()->force_bci(start()); - - current_state()->decache_for_trap(); - builder()->CreateCall2( - SharkRuntime::uncommon_trap(), - thread(), - LLVMValue::jint_constant(trap_request())); - builder()->CreateRetVoid(); - return; - } - // Parse the bytecode parse_bytecode(start(), limit()); // If this block falls through to the next then it won't have been // terminated by a bytecode and we have to add the branch ourselves - if (falls_through()) + if (falls_through() && !has_trap()) do_branch(ciTypeFlow::FALL_THROUGH); } @@ -478,6 +476,16 @@ void SharkTopLevelBlock::add_safepoint() current_state()->merge(orig_state, orig_block, safepointed_block); } +void SharkTopLevelBlock::do_trap(int trap_request) +{ + current_state()->decache_for_trap(); + builder()->CreateCall2( + SharkRuntime::uncommon_trap(), + thread(), + LLVMValue::jint_constant(trap_request)); + builder()->CreateRetVoid(); +} + void SharkTopLevelBlock::call_register_finalizer(Value *receiver) { BasicBlock *orig_block = builder()->GetInsertBlock(); diff -r ee08e16e223e -r eaa4c58a52a4 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Mon Apr 27 05:35:03 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Mon Apr 27 07:13:07 2009 -0400 @@ -32,8 +32,8 @@ class SharkTopLevelBlock : public SharkB function->thread()), _function(function), _ciblock(ciblock), - _trap_request(TRAP_UNCHECKED), _entered(false), + _has_trap(false), _needs_phis(false), _entry_state(NULL), _entry_block(NULL) {} @@ -106,26 +106,36 @@ class SharkTopLevelBlock : public SharkB // Traps private: - enum { - TRAP_UNCHECKED = 232323, // > any constant pool index - TRAP_NO_TRAPS - }; - int _trap_request; - - public: + bool _has_trap; + int _trap_request; + int _trap_bci; + + void set_trap(int trap_request, int trap_bci) + { + assert(!has_trap(), "shouldn't have"); + _has_trap = true; + _trap_request = trap_request; + _trap_bci = trap_bci; + } + + private: + bool has_trap() + { + return _has_trap; + } int trap_request() { - if (_trap_request == TRAP_UNCHECKED) - _trap_request = scan_for_traps(); + assert(has_trap(), "should have"); return _trap_request; } - bool has_trap() - { - return trap_request() != TRAP_NO_TRAPS; - } - - private: - int scan_for_traps(); + int trap_bci() + { + assert(has_trap(), "should have"); + return _trap_bci; + } + + private: + void scan_for_traps(); // Entry state private: @@ -292,6 +302,10 @@ class SharkTopLevelBlock : public SharkB // Safepoints private: void add_safepoint(); + + // Traps + private: + void do_trap(int trap_request); // Returns private: From ahughes at redhat.com Wed May 20 11:26:43 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:26:43 +0000 Subject: changeset in /hg/icedtea: Shark merge. Message-ID: changeset 559f45c9f58a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=559f45c9f58a description: Shark merge. 2009-04-28 Gary Benson * patches/hotspot/default/icedtea-shark.patch (ciInstanceKlass::constant_pool_tag_at): New method. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::do_full_instance_check): New method. (SharkTopLevelBlock::do_trapping_instance_check): Likewise. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::do_instance_check): Split. (SharkTopLevelBlock::do_full_instance_check): New method. (SharkTopLevelBlock::do_trapping_instance_check): Likewise. * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp (SharkRuntime::_resolve_klass): Removed. (SharkRuntime::resolve_klass): Likewise. (SharkRuntime::resolve_klass_C): Likewise. * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp (SharkRuntime::_resolve_klass): Likewise. (SharkRuntime::resolve_klass_C): Likewise. (SharkRuntime::initialize): Removed _resolve_klass init. diffstat: 6 files changed, 120 insertions(+), 106 deletions(-) ChangeLog | 20 ++ patches/hotspot/default/icedtea-shark.patch | 82 ++++++----- ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 12 - ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 6 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 103 +++++++-------- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 3 diffs (448 lines): diff -r eaa4c58a52a4 -r 559f45c9f58a ChangeLog --- a/ChangeLog Mon Apr 27 07:13:07 2009 -0400 +++ b/ChangeLog Tue May 19 16:12:46 2009 +0100 @@ -1,3 +1,23 @@ 2009-04-27 Gary Benson + + * patches/hotspot/default/icedtea-shark.patch + (ciInstanceKlass::constant_pool_tag_at): New method. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::do_full_instance_check): New method. + (SharkTopLevelBlock::do_trapping_instance_check): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::do_instance_check): Split. + (SharkTopLevelBlock::do_full_instance_check): New method. + (SharkTopLevelBlock::do_trapping_instance_check): Likewise. + * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp + (SharkRuntime::_resolve_klass): Removed. + (SharkRuntime::resolve_klass): Likewise. + (SharkRuntime::resolve_klass_C): Likewise. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::_resolve_klass): Likewise. + (SharkRuntime::resolve_klass_C): Likewise. + (SharkRuntime::initialize): Removed _resolve_klass init. + 2009-04-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkBlock.hpp diff -r eaa4c58a52a4 -r 559f45c9f58a patches/hotspot/default/icedtea-shark.patch --- a/patches/hotspot/default/icedtea-shark.patch Mon Apr 27 07:13:07 2009 -0400 +++ b/patches/hotspot/default/icedtea-shark.patch Tue May 19 16:12:46 2009 +0100 @@ -1,12 +1,21 @@ diff -Nru openjdk.orig/hotspot/src/share diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.cpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp ---- openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.cpp 2009-03-05 08:25:32.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp 2009-03-19 14:32:38.000000000 +0000 -@@ -548,3 +548,14 @@ +--- openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.cpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp 2009-05-19 16:10:18.000000000 +0100 +@@ -548,3 +548,23 @@ } return impl; } + +#ifdef SHARK ++// ------------------------------------------------------------------ ++// ciInstanceKlass::constant_pool_tag_at ++// ++// What is in this constant pool slot? ++constantTag ciInstanceKlass::constant_pool_tag_at(int index) { ++ VM_ENTRY_MARK; ++ return get_instanceKlass()->constants()->tag_at(index); ++} ++ +// ------------------------------------------------------------------ +// ciInstanceKlass::is_cache_entry_resolved +// @@ -17,21 +26,24 @@ diff -Nru openjdk.orig/hotspot/src/share +} +#endif // SHARK diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.hpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp ---- openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.hpp 2009-03-05 08:25:32.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp 2009-03-19 14:32:38.000000000 +0000 -@@ -198,4 +198,9 @@ +--- openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.hpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp 2009-05-19 16:11:21.000000000 +0100 +@@ -198,4 +198,12 @@ // What kind of ciObject is this? bool is_instance_klass() { return true; } bool is_java_klass() { return true; } + +#ifdef SHARK -+ // Is this entry in the constant pool cache resolved? -+ bool is_cache_entry_resolved(int index, Bytecodes::Code opcode); ++ // What is in this constant pool slot? ++ constantTag constant_pool_tag_at(int index); ++ ++ // Is this entry in the constant pool cache resolved? ++ bool is_cache_entry_resolved(int index, Bytecodes::Code opcode); +#endif // SHARK }; diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciMethod.cpp openjdk/hotspot/src/share/vm/ci/ciMethod.cpp ---- openjdk.orig/hotspot/src/share/vm/ci/ciMethod.cpp 2009-03-05 08:25:32.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/ci/ciMethod.cpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp 2009-05-19 16:07:37.000000000 +0100 @@ -56,9 +56,9 @@ _liveness = NULL; _bcea = NULL; @@ -98,8 +110,8 @@ diff -Nru openjdk.orig/hotspot/src/share // ------------------------------------------------------------------ diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciMethod.hpp openjdk/hotspot/src/share/vm/ci/ciMethod.hpp ---- openjdk.orig/hotspot/src/share/vm/ci/ciMethod.hpp 2009-03-05 08:25:32.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/ci/ciMethod.hpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp 2009-05-19 16:07:37.000000000 +0100 @@ -69,7 +69,7 @@ // Optional liveness analyzer. @@ -110,8 +122,8 @@ diff -Nru openjdk.orig/hotspot/src/share #endif diff -Nru openjdk.orig/hotspot/src/share/vm/code/nmethod.cpp openjdk/hotspot/src/share/vm/code/nmethod.cpp ---- openjdk.orig/hotspot/src/share/vm/code/nmethod.cpp 2009-03-05 08:25:32.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/code/nmethod.cpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp 2009-05-19 16:07:37.000000000 +0100 @@ -65,6 +65,11 @@ assert(compiler() != NULL, "must be"); return compiler()->is_c2(); @@ -150,8 +162,8 @@ diff -Nru openjdk.orig/hotspot/src/share tty->print("(nm) "); } diff -Nru openjdk.orig/hotspot/src/share/vm/code/nmethod.hpp openjdk/hotspot/src/share/vm/code/nmethod.hpp ---- openjdk.orig/hotspot/src/share/vm/code/nmethod.hpp 2009-03-05 08:25:32.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/code/nmethod.hpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/code/nmethod.hpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/code/nmethod.hpp 2009-05-19 16:07:37.000000000 +0100 @@ -318,6 +318,7 @@ bool is_compiled_by_c1() const; @@ -161,8 +173,8 @@ diff -Nru openjdk.orig/hotspot/src/share // boundaries for different parts address code_begin () const { return _entry_point; } diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/abstractCompiler.hpp openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp ---- openjdk.orig/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2009-03-05 08:25:32.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2009-05-19 16:07:37.000000000 +0100 @@ -45,18 +45,26 @@ // Missing feature tests virtual bool supports_native() { return true; } @@ -192,8 +204,8 @@ diff -Nru openjdk.orig/hotspot/src/share // Customization diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/compileBroker.cpp openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp ---- openjdk.orig/hotspot/src/share/vm/compiler/compileBroker.cpp 2009-03-05 08:25:32.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/compiler/compileBroker.cpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2009-05-19 16:07:37.000000000 +0100 @@ -554,6 +554,14 @@ #endif #endif // COMPILER2 @@ -210,8 +222,8 @@ diff -Nru openjdk.orig/hotspot/src/share _task_free_list = NULL; diff -Nru openjdk.orig/hotspot/src/share/vm/memory/cardTableModRefBS.hpp openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp ---- openjdk.orig/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2009-03-05 08:25:33.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2009-05-19 16:07:37.000000000 +0100 @@ -44,6 +44,7 @@ friend class VMStructs; friend class CardTableRS; @@ -221,9 +233,9 @@ diff -Nru openjdk.orig/hotspot/src/share // For debugging. friend class GuaranteeNotModClosure; diff -Nru openjdk.orig/hotspot/src/share/vm/oops/methodOop.cpp openjdk/hotspot/src/share/vm/oops/methodOop.cpp ---- openjdk.orig/hotspot/src/share/vm/oops/methodOop.cpp 2009-03-05 08:25:34.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp 2009-03-19 14:32:38.000000000 +0000 -@@ -727,10 +727,14 @@ +--- openjdk.orig/hotspot/src/share/vm/oops/methodOop.cpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp 2009-05-19 16:07:37.000000000 +0100 +@@ -738,10 +738,14 @@ } OrderAccess::storestore(); @@ -239,8 +251,8 @@ diff -Nru openjdk.orig/hotspot/src/share } diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/deoptimization.cpp openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/deoptimization.cpp 2009-03-05 08:25:35.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/runtime/deoptimization.cpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp 2009-05-19 16:07:37.000000000 +0100 @@ -229,6 +229,7 @@ } @@ -316,8 +328,8 @@ diff -Nru openjdk.orig/hotspot/src/share -#endif // COMPILER2 +#endif // COMPILER2 || SHARK diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/globals.cpp openjdk/hotspot/src/share/vm/runtime/globals.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/globals.cpp 2009-03-05 08:25:35.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/globals.cpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/runtime/globals.cpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/globals.cpp 2009-05-19 16:07:37.000000000 +0100 @@ -176,6 +176,18 @@ #define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 notproduct}", DEFAULT }, #endif @@ -348,8 +360,8 @@ diff -Nru openjdk.orig/hotspot/src/share }; diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp openjdk/hotspot/src/share/vm/runtime/globals.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp 2009-03-19 14:27:37.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp 2009-05-19 01:11:05.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2009-05-19 16:07:37.000000000 +0100 @@ -22,7 +22,7 @@ * */ @@ -360,8 +372,8 @@ diff -Nru openjdk.orig/hotspot/src/share define_pd_global(bool, UseTLAB, false); define_pd_global(bool, CICompileOSR, false); diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vframeArray.cpp openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/vframeArray.cpp 2009-03-05 08:25:35.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp 2009-03-19 14:32:38.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/runtime/vframeArray.cpp 2009-05-14 18:57:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp 2009-05-19 16:07:37.000000000 +0100 @@ -64,6 +64,11 @@ assert(monitor->owner() == NULL || (!monitor->owner()->is_unlocked() && !monitor->owner()->has_bias_pattern()), "object must be null or locked, and unbiased"); BasicObjectLock* dest = _monitors->at(index); @@ -387,8 +399,8 @@ diff -Nru openjdk.orig/hotspot/src/share } if (ProfileInterpreter) { diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2009-03-19 14:27:37.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2009-03-19 14:34:18.000000000 +0000 +--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2009-05-19 01:11:05.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2009-05-19 16:07:37.000000000 +0100 @@ -94,6 +94,9 @@ #ifdef TIERED #define VMTYPE "Server" diff -r eaa4c58a52a4 -r 559f45c9f58a ports/hotspot/src/share/vm/shark/sharkRuntime.cpp --- a/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Mon Apr 27 07:13:07 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Tue May 19 16:12:46 2009 +0100 @@ -37,7 +37,6 @@ Constant* SharkRuntime::_anewarray; Constant* SharkRuntime::_anewarray; Constant* SharkRuntime::_multianewarray; Constant* SharkRuntime::_register_finalizer; -Constant* SharkRuntime::_resolve_klass; Constant* SharkRuntime::_safepoint; Constant* SharkRuntime::_throw_ArrayIndexOutOfBoundsException; Constant* SharkRuntime::_throw_NullPointerException; @@ -93,10 +92,6 @@ void SharkRuntime::initialize(SharkBuild (intptr_t) new_instance_C, FunctionType::get(Type::VoidTy, params, false), "SharkRuntime__new_instance"); - _resolve_klass = builder->make_function( - (intptr_t) resolve_klass_C, - FunctionType::get(Type::VoidTy, params, false), - "SharkRuntime__resolve_klass"); params.clear(); params.push_back(SharkType::thread_type()); @@ -372,13 +367,6 @@ JRT_ENTRY(void, SharkRuntime::register_f } JRT_END -JRT_ENTRY(void, SharkRuntime::resolve_klass_C(JavaThread* thread, int index)) -{ - klassOop klass = method(thread)->constants()->klass_at(index, CHECK); - thread->set_vm_result(klass); -} -JRT_END - JRT_ENTRY(void, SharkRuntime::throw_ArrayIndexOutOfBoundsException_C( JavaThread* thread, const char* file, diff -r eaa4c58a52a4 -r 559f45c9f58a ports/hotspot/src/share/vm/shark/sharkRuntime.hpp --- a/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp Mon Apr 27 07:13:07 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp Tue May 19 16:12:46 2009 +0100 @@ -37,7 +37,6 @@ class SharkRuntime : public AllStatic { static llvm::Constant* _anewarray; static llvm::Constant* _multianewarray; static llvm::Constant* _register_finalizer; - static llvm::Constant* _resolve_klass; static llvm::Constant* _safepoint; static llvm::Constant* _throw_ArrayIndexOutOfBoundsException; static llvm::Constant* _throw_NullPointerException; @@ -74,10 +73,6 @@ class SharkRuntime : public AllStatic { static llvm::Constant* register_finalizer() { return _register_finalizer; - } - static llvm::Constant* resolve_klass() - { - return _resolve_klass; } static llvm::Constant* safepoint() { @@ -110,7 +105,6 @@ class SharkRuntime : public AllStatic { static void register_finalizer_C(JavaThread* thread, oop object); - static void resolve_klass_C(JavaThread* thread, int index); static void throw_ArrayIndexOutOfBoundsException_C(JavaThread* thread, const char* file, int line, diff -r eaa4c58a52a4 -r 559f45c9f58a ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Mon Apr 27 07:13:07 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Tue May 19 16:12:46 2009 +0100 @@ -1205,24 +1205,24 @@ void SharkTopLevelBlock::do_call() void SharkTopLevelBlock::do_instance_check() { - // Leave the object on the stack until after all the VM calls - assert(xstack(0)->is_jobject(), "should be"); - - ciKlass *klass = NULL; - if (bc() == Bytecodes::_checkcast) { - bool will_link; - klass = iter()->get_klass(will_link); - if (!will_link) { - // XXX why is this not typeflow's responsibility? - NOT_PRODUCT(warning("unresolved checkcast in %s", function()->name())); - klass = (ciKlass *) xstack(0)->type(); - } - } + constantTag tag = + target()->holder()->constant_pool_tag_at(iter()->get_klass_index()); + if (!tag.is_klass()) { + assert(tag.is_unresolved_klass(), "should be"); + do_trapping_instance_check(); + } + else { + do_full_instance_check(); + } +} + +void SharkTopLevelBlock::do_full_instance_check() +{ + bool will_link; + ciKlass *klass = iter()->get_klass(will_link); + assert(will_link, "should do"); BasicBlock *not_null = function()->CreateBlock("not_null"); - BasicBlock *fast_path = function()->CreateBlock("fast_path"); - BasicBlock *slow_path = function()->CreateBlock("slow_path"); - BasicBlock *got_klass = function()->CreateBlock("got_klass"); BasicBlock *subtype_check = function()->CreateBlock("subtype_check"); BasicBlock *is_instance = function()->CreateBlock("is_instance"); BasicBlock *not_instance = function()->CreateBlock("not_instance"); @@ -1235,9 +1235,12 @@ void SharkTopLevelBlock::do_instance_che IC_NOT_INSTANCE, }; + // Pop the object off the stack + Value *object = pop()->jobject_value(); + // Null objects aren't instances of anything builder()->CreateCondBr( - builder()->CreateICmpEQ(xstack(0)->jobject_value(), LLVMValue::null()), + builder()->CreateICmpEQ(object, LLVMValue::null()), merge2, not_null); BasicBlock *null_block = builder()->GetInsertBlock(); SharkState *null_state = current_state()->copy(); @@ -1245,42 +1248,11 @@ void SharkTopLevelBlock::do_instance_che // Get the class we're checking against builder()->SetInsertPoint(not_null); SharkConstantPool constants(this); - Value *tag = constants.tag_at(iter()->get_klass_index()); - builder()->CreateCondBr( - builder()->CreateOr( - builder()->CreateICmpEQ( - tag, LLVMValue::jbyte_constant(JVM_CONSTANT_UnresolvedClass)), - builder()->CreateICmpEQ( - tag, LLVMValue::jbyte_constant(JVM_CONSTANT_UnresolvedClassInError))), - slow_path, fast_path); - - // The fast path - builder()->SetInsertPoint(fast_path); - BasicBlock *fast_block = builder()->GetInsertBlock(); - SharkState *fast_state = current_state()->copy(); - Value *fast_klass = constants.object_at(iter()->get_klass_index()); - builder()->CreateBr(got_klass); - - // The slow path - builder()->SetInsertPoint(slow_path); - call_vm( - SharkRuntime::resolve_klass(), - LLVMValue::jint_constant(iter()->get_klass_index())); - Value *slow_klass = function()->CreateGetVMResult(); - BasicBlock *slow_block = builder()->GetInsertBlock(); - builder()->CreateBr(got_klass); - - // We have the class to test against - builder()->SetInsertPoint(got_klass); - current_state()->merge(fast_state, fast_block, slow_block); - PHINode *check_klass = builder()->CreatePHI( - SharkType::jobject_type(), "check_klass"); - check_klass->addIncoming(fast_klass, fast_block); - check_klass->addIncoming(slow_klass, slow_block); + Value *check_klass = constants.object_at(iter()->get_klass_index()); // Get the class of the object being tested Value *object_klass = builder()->CreateValueOfStructEntry( - xstack(0)->jobject_value(), in_ByteSize(oopDesc::klass_offset_in_bytes()), + object, in_ByteSize(oopDesc::klass_offset_in_bytes()), SharkType::jobject_type(), "object_klass"); @@ -1322,9 +1294,6 @@ void SharkTopLevelBlock::do_instance_che result->addIncoming(LLVMValue::jint_constant(IC_IS_NULL), null_block); result->addIncoming(nonnull_result, nonnull_block); - // We can finally pop the object! - Value *object = pop()->jobject_value(); - // Handle the result if (bc() == Bytecodes::_checkcast) { BasicBlock *failure = function()->CreateBlock("failure"); @@ -1349,6 +1318,34 @@ void SharkTopLevelBlock::do_instance_che builder()->CreateICmpEQ( result, LLVMValue::jint_constant(IC_IS_INSTANCE)), SharkType::jint_type(), false), false)); + } +} + +void SharkTopLevelBlock::do_trapping_instance_check() +{ + BasicBlock *not_null = function()->CreateBlock("not_null"); + BasicBlock *is_null = function()->CreateBlock("null"); + + // Leave the object on the stack so it's there if we trap + builder()->CreateCondBr( + builder()->CreateICmpEQ(xstack(0)->jobject_value(), LLVMValue::null()), + is_null, not_null); + SharkState *saved_state = current_state()->copy(); + + // If it's not null then we need to trap + builder()->SetInsertPoint(not_null); + set_current_state(saved_state->copy()); + do_trap( + Deoptimization::make_trap_request( + Deoptimization::Reason_uninitialized, + Deoptimization::Action_reinterpret)); + + // If it's null then we're ok + builder()->SetInsertPoint(is_null); + set_current_state(saved_state); + if (bc() == Bytecodes::_instanceof) { + pop(); + push(SharkValue::jint_constant(0)); } } diff -r eaa4c58a52a4 -r 559f45c9f58a ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Mon Apr 27 07:13:07 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Tue May 19 16:12:46 2009 +0100 @@ -366,6 +366,9 @@ class SharkTopLevelBlock : public SharkB // checkcast and instanceof private: + void do_full_instance_check(); + void do_trapping_instance_check(); + void do_instance_check(); // new and *newarray From gbenson at redhat.com Wed May 20 11:26:43 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 20 May 2009 18:26:43 +0000 Subject: changeset in /hg/icedtea: 2009-04-29 Gary Benson changeset 1dd098e01109 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1dd098e01109 description: 2009-04-29 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::scan_for_traps): Trap on ldc and ldc_w when the constant is unresolved. (SharkTopLevelBlock::lookup_for_ldc): Rewritten. * ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp (SharkConstantPool::java_mirror): Add a comment. diffstat: 3 files changed, 47 insertions(+), 62 deletions(-) ChangeLog | 9 + ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp | 1 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 99 +++++---------- diffs (144 lines): diff -r 559f45c9f58a -r 1dd098e01109 ChangeLog --- a/ChangeLog Tue May 19 16:12:46 2009 +0100 +++ b/ChangeLog Wed Apr 29 04:53:32 2009 -0400 @@ -1,3 +1,12 @@ 2009-04-28 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::scan_for_traps): Trap on ldc and ldc_w + when the constant is unresolved. + (SharkTopLevelBlock::lookup_for_ldc): Rewritten. + * ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp + (SharkConstantPool::java_mirror): Add a comment. + 2009-04-28 Gary Benson * patches/hotspot/default/icedtea-shark.patch diff -r 559f45c9f58a -r 1dd098e01109 ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp --- a/ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp Tue May 19 16:12:46 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp Wed Apr 29 04:53:32 2009 -0400 @@ -116,6 +116,7 @@ Value *SharkConstantPool::java_mirror() SharkType::klass_type(), "klass_part"); + // XXX should there be a memory barrier before this load? return builder()->CreateValueOfStructEntry( klass_part, in_ByteSize(Klass::java_mirror_offset_in_bytes()), diff -r 559f45c9f58a -r 1dd098e01109 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Tue May 19 16:12:46 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Wed Apr 29 04:53:32 2009 -0400 @@ -46,6 +46,17 @@ void SharkTopLevelBlock::scan_for_traps( int index = -1; switch (bc()) { + case Bytecodes::_ldc: + case Bytecodes::_ldc_w: + if (iter()->is_unresolved_string() || iter()->is_unresolved_klass()) { + set_trap( + Deoptimization::make_trap_request( + Deoptimization::Reason_uninitialized, + Deoptimization::Action_reinterpret), bci()); + return; + } + break; + case Bytecodes::_getfield: case Bytecodes::_getstatic: case Bytecodes::_putfield: @@ -579,69 +590,33 @@ void SharkTopLevelBlock::release_locked_ Value *SharkTopLevelBlock::lookup_for_ldc() { + int index = iter()->get_constant_index(); + constantTag tag = target()->holder()->constant_pool_tag_at(index); + SharkConstantPool constants(this); - - BasicBlock *resolved = function()->CreateBlock("resolved"); - BasicBlock *resolved_class = function()->CreateBlock("resolved_class"); - BasicBlock *unresolved = function()->CreateBlock("unresolved"); - BasicBlock *unknown = function()->CreateBlock("unknown"); - BasicBlock *done = function()->CreateBlock("done"); - - SwitchInst *switchinst = builder()->CreateSwitch( - constants.tag_at(iter()->get_constant_index()), - unknown, 5); - - switchinst->addCase( - LLVMValue::jbyte_constant(JVM_CONSTANT_String), resolved); - switchinst->addCase( - LLVMValue::jbyte_constant(JVM_CONSTANT_Class), resolved_class); - switchinst->addCase( - LLVMValue::jbyte_constant(JVM_CONSTANT_UnresolvedString), unresolved); - switchinst->addCase( - LLVMValue::jbyte_constant(JVM_CONSTANT_UnresolvedClass), unresolved); - switchinst->addCase( - LLVMValue::jbyte_constant(JVM_CONSTANT_UnresolvedClassInError), - unresolved); - - builder()->SetInsertPoint(resolved); - Value *resolved_value = constants.object_at(iter()->get_constant_index()); - builder()->CreateBr(done); - - builder()->SetInsertPoint(resolved_class); - Value *resolved_class_value - = constants.object_at(iter()->get_constant_index()); - resolved_class_value - = builder()->CreatePtrToInt(resolved_class_value, - SharkType::intptr_type()); - resolved_class_value - = (builder()->CreateAdd - (resolved_class_value, - (LLVMValue::intptr_constant - (klassOopDesc::klass_part_offset_in_bytes() - + Klass::java_mirror_offset_in_bytes())))); - // XXX FIXME: We need a memory barrier before this load. - resolved_class_value - = (builder()->CreateLoad - (builder()->CreateIntToPtr - (resolved_class_value, - PointerType::getUnqual(SharkType::jobject_type())))); - builder()->CreateBr(done); - - builder()->SetInsertPoint(unresolved); - builder()->CreateUnimplemented(__FILE__, __LINE__); - Value *unresolved_value = LLVMValue::null(); - builder()->CreateBr(done); - - builder()->SetInsertPoint(unknown); - builder()->CreateShouldNotReachHere(__FILE__, __LINE__); - builder()->CreateUnreachable(); - - builder()->SetInsertPoint(done); - PHINode *phi = builder()->CreatePHI(SharkType::jobject_type(), "constant"); - phi->addIncoming(resolved_value, resolved); - phi->addIncoming(resolved_class_value, resolved_class); - phi->addIncoming(unresolved_value, unresolved); - return phi; + Value *entry = constants.object_at(index); + + Value *klass_part; + switch (tag.value()) { + case JVM_CONSTANT_String: + return entry; + + case JVM_CONSTANT_Class: + klass_part = builder()->CreateAddressOfStructEntry( + entry, + in_ByteSize(klassOopDesc::klass_part_offset_in_bytes()), + SharkType::klass_type(), + "klass_part"); + // XXX FIXME: We need a memory barrier before this load + return builder()->CreateValueOfStructEntry( + klass_part, + in_ByteSize(Klass::java_mirror_offset_in_bytes()), + SharkType::oop_type(), + "java_mirror"); + + default: + ShouldNotReachHere(); + } } Value* SharkTopLevelBlock::lookup_for_field_access() From gbenson at redhat.com Wed May 20 11:26:44 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 20 May 2009 18:26:44 +0000 Subject: changeset in /hg/icedtea: 2009-05-01 Gary Benson changeset 05e7319d1854 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=05e7319d1854 description: 2009-05-01 Gary Benson * ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file. * ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp: Likewise. * ports/hotspot/src/share/vm/shark/sharkFunction.hpp (SharkFunction::_oopmap_frame_size): Removed field. (SharkFunction::_extended_frame_size): New field. (SharkFunction::extended_frame_size): New method. (SharkFunction::oopmap_frame_size): Updated for the above. * ports/hotspot/src/share/vm/shark/sharkFunction.cpp (SharkFunction::CreateBuildFrame): Likewise. * ports/hotspot/src/share/vm/shark/sharkState.hpp (SharkState::SharkState): Remove optional method argument. (SharkState::_frame_cache): New field. (SharkState::frame_cache): New method. * ports/hotspot/src/share/vm/shark/sharkState.cpp (SharkState::SharkState): Remove optional method argument. (SharkState::initialize): Initialize frame cache. (SharkState::equal_to): Compare frame cache. (SharkState::merge): Merge frame cache. (SharkState::decache_for_Java_call): Pass frame cache. (SharkState::cache_after_Java_call): Likewise. (SharkState::decache_for_VM_call): Likewise. (SharkState::cache_after_VM_call): Likewise. (SharkState::decache_for_trap): Likewise. (SharkEntryState::SharkEntryState): Don't load initial local variables directly, populate the state with dummy values and use a SharkFunctionEntryCacher to perform the loads. * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp (SharkCacherDecacher::SharkCacherDecacher): Remove bci argument, and add frame cache argument. (SharkCacherDecacher::_frame_cache): New field. (SharkCacherDecacher::frame_cache): New method. (SharkCacherDecacher::_bci): Removed field. (SharkCacherDecacher::bci): Removed method. (SharkDecacher::SharkDecacher): Add frame cache argument. (SharkDecacher::_bci): New field. (SharkDecacher::bci): New method. (SharkDecacher::write_value_to_frame): New method. (SharkJavaCallDecacher::SharkJavaCallDecacher): Add frame cache. (SharkVMCallDecacher::SharkVMCallDecacher): Likewise. (SharkTrapDecacher::SharkTrapDecacher): Likewise. (SharkCacher::SharkCacher): Likewise. (SharkDecacher::process_method_slot): Made virtual. (SharkDecacher::local_slot_needs_read): Likewise. (SharkDecacher::read_value_from_frame): New method. (SharkJavaCallCacher::SharkJavaCallDecacher): Add frame cache. (SharkVMCallCacher::SharkVMCallDecacher): Likewise. (SharkFunctionEntryCacher): New class. * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp (SharkDecacher::process_stack_slot): Use write_value_to_frame. (SharkDecacher::process_method_slot): Likewise. (SharkDecacher::process_local_slot): Likewise. (SharkCacher::process_stack_slot): Use read_value_from_frame. (SharkCacher::process_method_slot): Likewise. (SharkCacher::process_local_slot): Likewise. (SharkFunctionEntryCacher::process_method_slot): New method. (SharkDecacher::write_value_to_frame): Likewise. (SharkDecacher::read_value_from_frame): Likewise. * ports/hotspot/src/share/vm/includeDB_shark: Updated. diffstat: 10 files changed, 412 insertions(+), 99 deletions(-) ChangeLog | 65 ++++++++ ports/hotspot/src/share/vm/includeDB_shark | 13 + ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 67 +++++--- ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 126 ++++++++++++---- ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp | 66 ++++++++ ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp | 66 ++++++++ ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 6 ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 8 - ports/hotspot/src/share/vm/shark/sharkState.cpp | 73 +++++---- ports/hotspot/src/share/vm/shark/sharkState.hpp | 21 +- diffs (truncated from 868 to 500 lines): diff -r 1dd098e01109 -r 05e7319d1854 ChangeLog --- a/ChangeLog Wed Apr 29 04:53:32 2009 -0400 +++ b/ChangeLog Fri May 01 05:17:26 2009 -0400 @@ -1,3 +1,68 @@ 2009-04-29 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file. + * ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp: Likewise. + + * ports/hotspot/src/share/vm/shark/sharkFunction.hpp + (SharkFunction::_oopmap_frame_size): Removed field. + (SharkFunction::_extended_frame_size): New field. + (SharkFunction::extended_frame_size): New method. + (SharkFunction::oopmap_frame_size): Updated for the above. + * ports/hotspot/src/share/vm/shark/sharkFunction.cpp + (SharkFunction::CreateBuildFrame): Likewise. + + * ports/hotspot/src/share/vm/shark/sharkState.hpp + (SharkState::SharkState): Remove optional method argument. + (SharkState::_frame_cache): New field. + (SharkState::frame_cache): New method. + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkState::SharkState): Remove optional method argument. + (SharkState::initialize): Initialize frame cache. + (SharkState::equal_to): Compare frame cache. + (SharkState::merge): Merge frame cache. + (SharkState::decache_for_Java_call): Pass frame cache. + (SharkState::cache_after_Java_call): Likewise. + (SharkState::decache_for_VM_call): Likewise. + (SharkState::cache_after_VM_call): Likewise. + (SharkState::decache_for_trap): Likewise. + (SharkEntryState::SharkEntryState): Don't load initial local + variables directly, populate the state with dummy values and + use a SharkFunctionEntryCacher to perform the loads. + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp + (SharkCacherDecacher::SharkCacherDecacher): Remove bci argument, + and add frame cache argument. + (SharkCacherDecacher::_frame_cache): New field. + (SharkCacherDecacher::frame_cache): New method. + (SharkCacherDecacher::_bci): Removed field. + (SharkCacherDecacher::bci): Removed method. + (SharkDecacher::SharkDecacher): Add frame cache argument. + (SharkDecacher::_bci): New field. + (SharkDecacher::bci): New method. + (SharkDecacher::write_value_to_frame): New method. + (SharkJavaCallDecacher::SharkJavaCallDecacher): Add frame cache. + (SharkVMCallDecacher::SharkVMCallDecacher): Likewise. + (SharkTrapDecacher::SharkTrapDecacher): Likewise. + (SharkCacher::SharkCacher): Likewise. + (SharkDecacher::process_method_slot): Made virtual. + (SharkDecacher::local_slot_needs_read): Likewise. + (SharkDecacher::read_value_from_frame): New method. + (SharkJavaCallCacher::SharkJavaCallDecacher): Add frame cache. + (SharkVMCallCacher::SharkVMCallDecacher): Likewise. + (SharkFunctionEntryCacher): New class. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkDecacher::process_stack_slot): Use write_value_to_frame. + (SharkDecacher::process_method_slot): Likewise. + (SharkDecacher::process_local_slot): Likewise. + (SharkCacher::process_stack_slot): Use read_value_from_frame. + (SharkCacher::process_method_slot): Likewise. + (SharkCacher::process_local_slot): Likewise. + (SharkFunctionEntryCacher::process_method_slot): New method. + (SharkDecacher::write_value_to_frame): Likewise. + (SharkDecacher::read_value_from_frame): Likewise. + + * ports/hotspot/src/share/vm/includeDB_shark: Updated. + 2009-04-29 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp diff -r 1dd098e01109 -r 05e7319d1854 ports/hotspot/src/share/vm/includeDB_shark --- a/ports/hotspot/src/share/vm/includeDB_shark Wed Apr 29 04:53:32 2009 -0400 +++ b/ports/hotspot/src/share/vm/includeDB_shark Fri May 01 05:17:26 2009 -0400 @@ -117,12 +117,14 @@ sharkCacheDecache.cpp sharkCacheDecache.cpp llvmValue.hpp sharkCacheDecache.cpp sharkBuilder.hpp sharkCacheDecache.cpp sharkCacheDecache.hpp +sharkCacheDecache.cpp sharkFrameCache.hpp sharkCacheDecache.cpp sharkFunction.hpp sharkCacheDecache.cpp sharkState.inline.hpp sharkCacheDecache.hpp ciMethod.hpp sharkCacheDecache.hpp debugInfoRec.hpp sharkCacheDecache.hpp sharkBuilder.hpp +sharkCacheDecache.hpp sharkFrameCache.hpp sharkCacheDecache.hpp sharkFunction.hpp sharkCacheDecache.hpp sharkStateScanner.hpp @@ -173,6 +175,15 @@ sharkEntry.cpp sharkEntry.hpp llvmHeaders.hpp +sharkFrameCache.cpp allocation.hpp +sharkFrameCache.cpp llvmHeaders.hpp +sharkFrameCache.cpp sharkFrameCache.hpp +sharkFrameCache.cpp sharkFunction.hpp + +sharkFrameCache.hpp allocation.hpp +sharkFrameCache.hpp llvmHeaders.hpp +sharkFrameCache.hpp sharkFunction.hpp + sharkFunction.cpp allocation.hpp sharkFunction.cpp ciTypeFlow.hpp sharkFunction.cpp debug.hpp @@ -263,6 +274,7 @@ sharkState.cpp sharkState.cpp ciTypeFlow.hpp sharkState.cpp sharkBuilder.hpp sharkState.cpp sharkCacheDecache.hpp +sharkState.cpp sharkFrameCache.hpp sharkState.cpp sharkState.inline.hpp sharkState.cpp sharkTopLevelBlock.hpp sharkState.cpp sharkType.hpp @@ -272,6 +284,7 @@ sharkState.hpp sharkState.hpp ciMethod.hpp sharkState.hpp llvmHeaders.hpp sharkState.hpp sharkBuilder.hpp +sharkState.hpp sharkFrameCache.hpp sharkState.hpp sharkValue.hpp sharkState.inline.hpp sharkBlock.hpp diff -r 1dd098e01109 -r 05e7319d1854 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Wed Apr 29 04:53:32 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Fri May 01 05:17:26 2009 -0400 @@ -59,11 +59,10 @@ void SharkDecacher::process_stack_slot(i // Write the value to the frame if necessary if (stack_slot_needs_write(index, value)) { - builder()->CreateStore( + write_value_to_frame( + SharkType::to_stackType(value->basic_type()), value->generic_value(), - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))); + adjusted_offset(value, offset)); } // Record the value in the oopmap if necessary @@ -104,11 +103,11 @@ void SharkDecacher::process_method_slot( void SharkDecacher::process_method_slot(llvm::Value** value, int offset) { // Decache the method pointer - builder()->CreateStore( + write_value_to_frame( + SharkType::methodOop_type(), *value, - function()->CreateAddressOfFrameEntry( - offset, - SharkType::methodOop_type())); + offset); + oopmap()->set_oop(slot2reg(offset)); } @@ -134,11 +133,10 @@ void SharkDecacher::process_local_slot(i // Write the value to the frame if necessary if (local_slot_needs_write(index, value)) { - builder()->CreateStore( + write_value_to_frame( + SharkType::to_stackType(value->basic_type()), value->generic_value(), - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))); + adjusted_offset(value, offset)); } // Record the value in the oopmap if necessary @@ -177,10 +175,9 @@ void SharkCacher::process_stack_slot(int if (stack_slot_needs_read(index, value)) { *addr = SharkValue::create_generic( value->type(), - builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))), + read_value_from_frame( + SharkType::to_stackType(value->basic_type()), + adjusted_offset(value, offset)), value->zero_checked()); } } @@ -188,10 +185,14 @@ void SharkCacher::process_method_slot(ll void SharkCacher::process_method_slot(llvm::Value** value, int offset) { // Cache the method pointer - *value = builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - offset, - SharkType::methodOop_type())); + *value = read_value_from_frame(SharkType::methodOop_type(), offset); +} + +void SharkFunctionEntryCacher::process_method_slot(llvm::Value** value, + int offset) +{ + // "Cache" the method pointer + *value = method(); } void SharkCacher::process_local_slot(int index, @@ -204,10 +205,28 @@ void SharkCacher::process_local_slot(int if (local_slot_needs_read(index, value)) { *addr = SharkValue::create_generic( value->type(), - builder()->CreateLoad( - function()->CreateAddressOfFrameEntry( - adjusted_offset(value, offset), - SharkType::to_stackType(value->basic_type()))), + read_value_from_frame( + SharkType::to_stackType(value->basic_type()), + adjusted_offset(value, offset)), value->zero_checked()); } } + +void SharkDecacher::write_value_to_frame(const llvm::Type* type, + llvm::Value* value, + int offset) +{ + if (frame_cache()->value(offset) != value) { + builder()->CreateStore( + value, + function()->CreateAddressOfFrameEntry(offset, type)); + } +} + +Value* SharkCacher::read_value_from_frame(const llvm::Type* type, int offset) +{ + Value *result = builder()->CreateLoad( + function()->CreateAddressOfFrameEntry(offset, type)); + frame_cache()->set_value(offset, result); + return result; +} diff -r 1dd098e01109 -r 05e7319d1854 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Wed Apr 29 04:53:32 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Fri May 01 05:17:26 2009 -0400 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 Red Hat, Inc. + * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,26 +33,27 @@ // - SharkCacher // - SharkJavaCallCacher // - SharkVMCallCacher +// - SharkFunctionEntryCacher class SharkCacherDecacher : public SharkStateScanner { protected: - SharkCacherDecacher(SharkFunction* function, int bci) - : SharkStateScanner(function), _bci(bci) {} + SharkCacherDecacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkStateScanner(function), _frame_cache(frame_cache) {} + + private: + SharkFrameCache* _frame_cache; + + protected: + SharkFrameCache* frame_cache() const + { + return _frame_cache; + } protected: SharkBuilder* builder() const { return function()->builder(); } - - private: - int _bci; - - protected: - int bci() const - { - return _bci; - } // Helper protected: @@ -66,8 +67,17 @@ class SharkCacherDecacher : public Shark class SharkDecacher : public SharkCacherDecacher { protected: - SharkDecacher(SharkFunction* function, int bci) - : SharkCacherDecacher(function, bci) {} + SharkDecacher(SharkFunction* function, SharkFrameCache* frame_cache, int bci) + : SharkCacherDecacher(function, frame_cache), _bci(bci) {} + + private: + int _bci; + + protected: + int bci() const + { + return _bci; + } private: DebugInformationRecorder* debug_info() const @@ -171,12 +181,21 @@ class SharkDecacher : public SharkCacher return Location::normal; return Location::invalid; } + + // Writer helper + protected: + void write_value_to_frame(const llvm::Type* type, + llvm::Value* value, + int offset); }; class SharkJavaCallDecacher : public SharkDecacher { public: - SharkJavaCallDecacher(SharkFunction* function, int bci, ciMethod* callee) - : SharkDecacher(function, bci), _callee(callee) {} + SharkJavaCallDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci, + ciMethod* callee) + : SharkDecacher(function, frame_cache, bci), _callee(callee) {} private: ciMethod* _callee; @@ -220,8 +239,10 @@ class SharkJavaCallDecacher : public Sha class SharkVMCallDecacher : public SharkDecacher { public: - SharkVMCallDecacher(SharkFunction* function, int bci) - : SharkDecacher(function, bci) {} + SharkVMCallDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci) + : SharkDecacher(function, frame_cache, bci) {} // Stack slot helpers protected: @@ -256,8 +277,10 @@ class SharkVMCallDecacher : public Shark class SharkTrapDecacher : public SharkDecacher { public: - SharkTrapDecacher(SharkFunction* function, int bci) - : SharkDecacher(function, bci) {} + SharkTrapDecacher(SharkFunction* function, + SharkFrameCache* frame_cache, + int bci) + : SharkDecacher(function, frame_cache, bci) {} // Stack slot helpers protected: @@ -292,14 +315,14 @@ class SharkTrapDecacher : public SharkDe class SharkCacher : public SharkCacherDecacher { protected: - SharkCacher(SharkFunction* function, int bci) - : SharkCacherDecacher(function, bci) {} + SharkCacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkCacherDecacher(function, frame_cache) {} // Callbacks protected: void process_stack_slot(int index, SharkValue** value, int offset); - void process_method_slot(llvm::Value** value, int offset); + virtual void process_method_slot(llvm::Value** value, int offset); void process_local_slot(int index, SharkValue** value, int offset); @@ -309,16 +332,22 @@ class SharkCacher : public SharkCacherDe // Local slot helper protected: - bool local_slot_needs_read(int index, SharkValue* value) - { - return value && value->is_jobject(); - } + virtual bool local_slot_needs_read(int index, SharkValue* value) + { + return value && value->is_jobject(); + } + + // Writer helper + protected: + llvm::Value* read_value_from_frame(const llvm::Type* type, int offset); }; class SharkJavaCallCacher : public SharkCacher { public: - SharkJavaCallCacher(SharkFunction* function, int bci, ciMethod* callee) - : SharkCacher(function, bci), _callee(callee) {} + SharkJavaCallCacher(SharkFunction* function, + SharkFrameCache* frame_cache, + ciMethod* callee) + : SharkCacher(function, frame_cache), _callee(callee) {} private: ciMethod* _callee; @@ -340,8 +369,8 @@ class SharkJavaCallCacher : public Shark class SharkVMCallCacher : public SharkCacher { public: - SharkVMCallCacher(SharkFunction* function, int bci) - : SharkCacher(function, bci) {} + SharkVMCallCacher(SharkFunction* function, SharkFrameCache* frame_cache) + : SharkCacher(function, frame_cache) {} // Stack slot helper protected: @@ -350,3 +379,38 @@ class SharkVMCallCacher : public SharkCa return value && value->is_jobject(); } }; + +class SharkFunctionEntryCacher : public SharkCacher { + public: + SharkFunctionEntryCacher(SharkFunction* function, + SharkFrameCache* frame_cache, + llvm::Value* method) + : SharkCacher(function, frame_cache), _method(method) {} + + private: + llvm::Value* _method; + + private: + llvm::Value* method() const + { + return _method; + } + + // Method slot callback + protected: + void process_method_slot(llvm::Value** value, int offset); + + // Stack slot helper + protected: + bool stack_slot_needs_read(int index, SharkValue* value) + { + ShouldNotReachHere(); // entry block shouldn't have stack + } + + // Local slot helper + protected: + virtual bool local_slot_needs_read(int index, SharkValue* value) + { + return value != NULL; + } +}; diff -r 1dd098e01109 -r 05e7319d1854 ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp Fri May 01 05:17:26 2009 -0400 @@ -0,0 +1,66 @@ +/* + * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2009 Red Hat, Inc. + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + +#include "incls/_precompiled.incl" +#include "incls/_sharkFrameCache.cpp.incl" + +using namespace llvm; + +SharkFrameCache::SharkFrameCache(SharkFunction *function) + : _frame_size(function->extended_frame_size()) +{ + _values = NEW_RESOURCE_ARRAY(Value*, frame_size()); + memset(_values, 0, frame_size() * sizeof(Value *)); +} + +SharkFrameCache::SharkFrameCache(const SharkFrameCache* cache) + : _frame_size(cache->frame_size()) +{ + _values = NEW_RESOURCE_ARRAY(Value*, frame_size()); + memcpy(_values, cache->_values, frame_size() * sizeof(Value *)); From ahughes at redhat.com Wed May 20 11:26:44 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:26:44 +0000 Subject: changeset in /hg/icedtea: Shark merge. Message-ID: changeset dd44934ab114 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dd44934ab114 description: Shark merge. 2009-05-05 Xerxes R?nby * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from SHARK_LLVM_VERSION. diffstat: 2 files changed, 6 insertions(+) ChangeLog | 5 +++++ configure.ac | 1 + diffs (23 lines): diff -r 05e7319d1854 -r dd44934ab114 ChangeLog --- a/ChangeLog Fri May 01 05:17:26 2009 -0400 +++ b/ChangeLog Tue May 19 16:19:49 2009 +0100 @@ -1,3 +1,8 @@ 2009-05-01 Gary Benson + + * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from + SHARK_LLVM_VERSION. + 2009-05-01 Gary Benson * ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file. diff -r 05e7319d1854 -r dd44934ab114 configure.ac --- a/configure.ac Fri May 01 05:17:26 2009 -0400 +++ b/configure.ac Tue May 19 16:19:49 2009 +0100 @@ -542,6 +542,7 @@ if test "x${SHARK_BUILD_TRUE}" = x; then LLVM_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \ sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \ sed -e 's/-D_DEBUG//g'` + LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`" LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components` LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components` fi From xerxes at zafena.se Wed May 20 11:26:45 2009 From: xerxes at zafena.se (Xerxes R?nby) Date: Wed, 20 May 2009 18:26:45 +0000 Subject: changeset in /hg/icedtea: 2009-05-05 Xerxes R?nby changeset 7ecb9ff6ed05 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7ecb9ff6ed05 description: 2009-05-05 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp (SharkCompiler::SharkCompiler): Use bool or enum to set JIT optimization dependent on the llvm version. diffstat: 2 files changed, 18 insertions(+) ChangeLog | 6 ++++++ ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 12 ++++++++++++ diffs (36 lines): diff -r dd44934ab114 -r 7ecb9ff6ed05 ChangeLog --- a/ChangeLog Tue May 19 16:19:49 2009 +0100 +++ b/ChangeLog Tue May 05 13:30:07 2009 +0200 @@ -1,3 +1,9 @@ 2009-05-05 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp + (SharkCompiler::SharkCompiler): Use bool or enum to set + JIT optimization dependent on the llvm version. + 2009-05-05 Xerxes R??nby * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from diff -r dd44934ab114 -r 7ecb9ff6ed05 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue May 19 16:19:49 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue May 05 13:30:07 2009 +0200 @@ -41,7 +41,19 @@ SharkCompiler::SharkCompiler() ModuleProvider *module_provider = new ExistingModuleProvider(module()); _memory_manager = new SharkMemoryManager(); _execution_engine = ExecutionEngine::createJIT( +#if SHARK_LLVM_VERSION >= 26 + /* + * LLVM 26 introduced a more fine-grained control to set the optimization + * level when creating the LLVM JIT. + * The optimization level are now specified with a enum instead of a bool. + * CodeGenOpt::None = bool true; a fast JIT with reduced optimization. + * CodeGenOpt::Default = bool false; a non-fast JIT with optimization. + * CodeGenOpt::Aggressive = a new non-fast JIT with best optimization. + */ + module_provider, NULL, memory_manager(), CodeGenOpt::Default); +#else module_provider, NULL, memory_manager(), false); +#endif // Initialize Shark components that need it SharkType::initialize(); From ahughes at redhat.com Wed May 20 11:26:45 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:26:45 +0000 Subject: changeset in /hg/icedtea: Shark merge. Message-ID: changeset dc69eba97b21 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dc69eba97b21 description: Shark merge. 2009-04-29 Matthias Klose Xerxes R?nby * configure.am (LLVM_CFLAGS): Add SHARK_LLVM_VERSION. * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp, ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: New methods getDlsymTable, SetDlsymTable, allocateSpace, dependent on the llvm version. diffstat: 3 files changed, 39 insertions(+) ChangeLog | 9 ++++++ ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 21 +++++++++++++++ ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 9 ++++++ diffs (67 lines): diff -r 7ecb9ff6ed05 -r dc69eba97b21 ChangeLog --- a/ChangeLog Tue May 05 13:30:07 2009 +0200 +++ b/ChangeLog Tue May 19 16:23:38 2009 +0100 @@ -8,6 +8,15 @@ 2009-05-05 Xerxes R??nby + Xerxes R??nby + + * configure.am (LLVM_CFLAGS): Add SHARK_LLVM_VERSION. + * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp, + ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: New + methods getDlsymTable, SetDlsymTable, allocateSpace, dependent + on the llvm version. 2009-05-01 Gary Benson diff -r 7ecb9ff6ed05 -r dc69eba97b21 ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp --- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp Tue May 05 13:30:07 2009 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp Tue May 19 16:23:38 2009 +0100 @@ -90,3 +90,24 @@ void SharkMemoryManager::deallocateMemFo { return mm()->deallocateMemForFunction(F); } + +#if SHARK_LLVM_VERSION >= 26 +void* SharkMemoryManager::getDlsymTable() const +{ + return mm()->getDlsymTable(); +} + +void SharkMemoryManager::SetDlsymTable(void *ptr) +{ + mm()->SetDlsymTable(ptr); +} + +#endif + +#if SHARK_LLVM_VERSION >= 25 +unsigned char *SharkMemoryManager::allocateSpace(intptr_t Size, + unsigned int Alignment) +{ + return mm()->allocateSpace(Size, Alignment); +} +#endif diff -r 7ecb9ff6ed05 -r dc69eba97b21 ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp --- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp Tue May 05 13:30:07 2009 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp Tue May 19 16:23:38 2009 +0100 @@ -71,7 +71,16 @@ class SharkMemoryManager : public llvm:: unsigned char* TableStart, unsigned char* TableEnd, unsigned char* FrameRegister); +#if SHARK_LLVM_VERSION >= 26 + void* getDlsymTable() const; + void SetDlsymTable(void *ptr); +#endif void setMemoryWritable(); void setMemoryExecutable(); void deallocateMemForFunction(const llvm::Function* F); + +#if SHARK_LLVM_VERSION >= 25 + unsigned char *allocateSpace(intptr_t Size, + unsigned int Alignment); +#endif }; From gnu_andrew at member.fsf.org Wed May 20 11:29:42 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 20 May 2009 19:29:42 +0100 Subject: Zero/Shark broken with IcedTea7 / HS16b03 Message-ID: <17c6771e0905201129k2d8873a8ia6f0e4b3941bb4a7@mail.gmail.com> This is current IcedTea7 with all the latest Zero/Shark changes applied (AFAIK): g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DAMD64 -DZERO_LIBARCH=\"amd64\" -DPRODUCT -I. -I../generated/adfiles -I../generated/jvmtifiles -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/c1 -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/ci -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/classfile -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/code -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/compiler -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/gc_implementation -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/gc_implementation/g1 -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parallelScavenge -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parNew -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/gc_implementation/shared -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/gc_interface -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/interpreter -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/memory -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/oops -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/prims -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/runtime -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/services -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/shark -I/mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/utilities -I/mnt/builder/zero/openjdk-ecj/hotspot/src/cpu/zero/vm -I/mnt/builder/zero/openjdk-ecj/hotspot/src/os/linux/vm -I/mnt/builder/zero/openjdk-ecj/hotspot/src/os_cpu/linux_zero/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"16.0-b03\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"andrew\"" -DHOTSPOT_LIB_ARCH=\"amd64\" -DJRE_RELEASE_VERSION="\"1.7.0_0-b59\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -g -m64 -pipe -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1 -Werror -Wpointer-arith -Wsign-compare -c -x c++-header -c ../generated/incls/_precompiled.incl -o incls/_precompiled.incl.gch In file included from ../generated/incls/_precompiled.incl:72: /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp: In constructor 'RegisterOrConstant::RegisterOrConstant()': /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp:152: error: 'noreg' was not declared in this scope /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp: In constructor 'RegisterOrConstant::RegisterOrConstant(intptr_t)': /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp:154: error: 'noreg' was not declared in this scope /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp: In member function 'bool RegisterOrConstant::is_register() const': /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp:162: error: 'noreg' was not declared in this scope /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp: In member function 'bool RegisterOrConstant::is_constant() const': /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp:163: error: 'noreg' was not declared in this scope In file included from ../generated/incls/_precompiled.incl:233: /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/interpreter/interpreter.hpp: In constructor 'CodeletMark::CodeletMark(InterpreterMacroAssembler*&, const char*, Bytecodes::Code)': /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/interpreter/interpreter.hpp:107: error: cannot allocate an object of abstract type 'InterpreterMacroAssembler' /mnt/builder/zero/openjdk-ecj/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp:28: note: because the following virtual functions are pure within 'InterpreterMacroAssembler': /mnt/builder/zero/openjdk-ecj/hotspot/src/share/vm/asm/assembler.hpp:319: note: virtual RegisterOrConstant AbstractAssembler::delayed_value_impl(intptr_t*, RegisterImpl*, int) make[7]: *** [incls/_precompiled.incl.gch] Error 1 make[7]: Leaving directory `/mnt/builder/zero/openjdk-ecj/build/linux-amd64/hotspot/outputdir/linux_zero_core/product' make[6]: *** [the_vm] Error 2 make[6]: Leaving directory `/mnt/builder/zero/openjdk-ecj/build/linux-amd64/hotspot/outputdir/linux_zero_core/product' make[5]: *** [productcore] Error 2 make[5]: Leaving directory `/mnt/builder/zero/openjdk-ecj/build/linux-amd64/hotspot/outputdir' make[4]: *** [generic_buildcore] Error 2 make[4]: Leaving directory `/mnt/builder/zero/openjdk-ecj/hotspot/make' make[3]: *** [productcore] Error 2 make[3]: Leaving directory `/mnt/builder/zero/openjdk-ecj/hotspot/make' make[2]: *** [hotspot-build] Error 2 make[2]: Leaving directory `/mnt/builder/zero/openjdk-ecj' make[1]: *** [build_product_image] Error 2 make[1]: Leaving directory `/mnt/builder/zero/openjdk-ecj' make: *** [stamps/icedtea-ecj.stamp] Error 2 May be related to http://hg.openjdk.java.net/icedtea/jdk7/hotspot/rev/c89f86385056 but not sure. Gary, help! -- 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 langel at redhat.com Wed May 20 11:51:24 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 20 May 2009 18:51:24 +0000 Subject: changeset in /hg/icedtea: 2009-04-24 Lillian Angel changeset a78694915634 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a78694915634 description: 2009-04-24 Lillian Angel Fixes #497191 * Makefile.am (NETBEANS_PROFILER_MD5SUM): Updated. (stamps/nbplatform.stamp): Fixed to build on amd64 properly. diffstat: 1 file changed, 6 insertions(+), 4 deletions(-) Makefile.am | 10 ++++++---- diffs (36 lines): diff -r dc69eba97b21 -r a78694915634 Makefile.am --- a/Makefile.am Tue May 19 16:23:38 2009 +0100 +++ b/Makefile.am Fri Apr 24 14:09:22 2009 -0400 @@ -19,7 +19,7 @@ CACAO_VERSION = 0.99.4 CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa -NETBEANS_PROFILER_MD5SUM = 786ab31817cbd902a7211cd6a6161750 +NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380 VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe if ENABLE_PLUGIN @@ -3241,18 +3241,20 @@ if WITH_VISUALVM if WITH_VISUALVM cd netbeans ; \ rm nbbuild/external/binaries-list ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ mkdir -p ./nbbuild/netbeans_visualvm/ ; \ ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \ ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \ ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \ - cd lib.profiler/native/build ; \ if ! (uname -a | grep x86_64) ; then \ + mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ + mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ buildscript=./buildnative-linux-15.sh ; \ else \ + mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \ + mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \ buildscript=./buildnative-linux64-15.sh ; \ fi ; \ + cd lib.profiler/native/build ; \ JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \ $$buildscript ; \ cd ../../.. ; \ From ahughes at redhat.com Wed May 20 11:51:24 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:51:24 +0000 Subject: changeset in /hg/icedtea: Update ChangeLog. Message-ID: changeset 833e810f111b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=833e810f111b description: Update ChangeLog. diffstat: 1 file changed, 7 insertions(+) ChangeLog | 7 +++++++ diffs (14 lines): diff -r a78694915634 -r 833e810f111b ChangeLog --- a/ChangeLog Fri Apr 24 14:09:22 2009 -0400 +++ b/ChangeLog Wed May 20 19:35:39 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-05 Xerxes R??nby + + Fixes #497191 + * Makefile.am + (NETBEANS_PROFILER_MD5SUM): Updated. + (stamps/nbplatform.stamp): Fixed to build on amd64 properly. + 2009-05-05 Xerxes R??nby * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp From ahughes at redhat.com Wed May 20 11:51:25 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:51:25 +0000 Subject: changeset in /hg/icedtea: SystemTap forwardport. Message-ID: changeset 87de14662618 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=87de14662618 description: SystemTap forwardport. 2009-03-27 Mark Wielaard * patches/icedtea-systemtap.patch: New patch. * configure.ac: Add AC_ARG_ENABLE systemtap and AC_CHECK_HEADER for sys/sdt.h when --enable-systemtap given. * Makefile.am: Add patches/icedtea-systemtap.patch to ICEDTEA_PATCHES if ENABLE_SYSTEMTAP. diffstat: 4 files changed, 188 insertions(+) ChangeLog | 8 + Makefile.am | 4 configure.ac | 14 +++ patches/icedtea-systemtap.patch | 162 +++++++++++++++++++++++++++++++++++++++ diffs (226 lines): diff -r 833e810f111b -r 87de14662618 ChangeLog --- a/ChangeLog Wed May 20 19:35:39 2009 +0100 +++ b/ChangeLog Wed May 20 19:38:42 2009 +0100 @@ -1,3 +1,11 @@ 2009-04-24 Lillian Angel + + * patches/icedtea-systemtap.patch: New patch. + * configure.ac: Add AC_ARG_ENABLE systemtap and AC_CHECK_HEADER + for sys/sdt.h when --enable-systemtap given. + * Makefile.am: Add patches/icedtea-systemtap.patch to + ICEDTEA_PATCHES if ENABLE_SYSTEMTAP. + 2009-04-24 Lillian Angel Fixes #497191 diff -r 833e810f111b -r 87de14662618 Makefile.am --- a/Makefile.am Wed May 20 19:35:39 2009 +0100 +++ b/Makefile.am Wed May 20 19:38:42 2009 +0100 @@ -2004,6 +2004,10 @@ ICEDTEA_PATCHES += patches/icedtea-nio2. ICEDTEA_PATCHES += patches/icedtea-nio2.patch endif +if ENABLE_SYSTEMTAP +ICEDTEA_PATCHES += patches/icedtea-systemtap.patch +endif + stamps/extract.stamp: stamps/download.stamp if OPENJDK_SRC_DIR_FOUND cp -a $(OPENJDK_SRC_DIR) openjdk diff -r 833e810f111b -r 87de14662618 configure.ac --- a/configure.ac Wed May 20 19:35:39 2009 +0100 +++ b/configure.ac Wed May 20 19:38:42 2009 +0100 @@ -182,6 +182,14 @@ AC_ARG_ENABLE([nio2], [ENABLE_NIO2="${enableval}"], [ENABLE_NIO2='yes']) AM_CONDITIONAL([ENABLE_NIO2], [test x$ENABLE_NIO2 = xyes]) AC_MSG_RESULT(${ENABLE_NIO2}) + +AC_MSG_CHECKING([whether to include SystemTap tracing support]) +AC_ARG_ENABLE([systemtap], + [AS_HELP_STRING([--enable-systemtap], + [Enable inclusion of SystemTap trace support])], + [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no']) +AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) +AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) AC_MSG_CHECKING([how many parallel build jobs to execute]) AC_ARG_WITH([parallel-jobs], @@ -400,6 +408,12 @@ Try installing libXrender-devel or confi fi fi +if test "x${ENABLE_SYSTEMTAP}" = xyes; then +AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], + [SDT_H_FOUND='no'; + AC_MSG_ERROR([systemtap support needs sys/sdt.h header])]) +fi + dnl Check for libpng headers and libraries. PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] ,[LIBPNG_FOUND=no]) diff -r 833e810f111b -r 87de14662618 patches/icedtea-systemtap.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-systemtap.patch Wed May 20 19:38:42 2009 +0100 @@ -0,0 +1,162 @@ +diff -r 945bf7540697 make/linux/makefiles/dtrace.make +--- openjdk/hotspot/make/linux/makefiles/dtrace.make Thu Jan 22 14:42:01 2009 -0800 ++++ openjdk/hotspot/make/linux/makefiles/dtrace.make Mon Feb 02 13:47:34 2009 +0100 +@@ -25,3 +25,7 @@ + # Linux does not build jvm_db + LIBJVM_DB = + ++# But it does have a Systemtap dtrace compatible sys/sdt.h ++CFLAGS += -DDTRACE_ENABLED ++ ++# It doesn't support HAVE_DTRACE_H though. +diff -r 945bf7540697 src/share/vm/code/nmethod.cpp +--- openjdk/hotspot/src/share/vm/code/nmethod.cpp Thu Jan 22 14:42:01 2009 -0800 ++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp Mon Feb 02 13:47:34 2009 +0100 +@@ -22,6 +22,14 @@ + * + */ + ++#ifdef __GNUC__ ++// GCC seems to have some trouble with the inserted probes. ++// error: _probe_compiled__method__unload causes a section type conflict ++// error: compiled__method__unload_probe_name causes a section type conflict ++// So disable probe insertion for now. ++#undef DTRACE_ENABLED ++#endif ++ + # include "incls/_precompiled.incl" + # include "incls/_nmethod.cpp.incl" + +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" + +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 +@@ -1,5 +1,6 @@ + /* + * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. ++ * Copyright 2009 Red Hat, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -22,14 +23,14 @@ + * + */ + +-#if defined(SOLARIS) && defined(DTRACE_ENABLED) ++#if defined(DTRACE_ENABLED) + + #include + + #define DTRACE_ONLY(x) x + #define NOT_DTRACE(x) + +-#else // ndef SOLARIS || ndef DTRACE_ENABLED ++#else // ndef DTRACE_ENABLED + + #define DTRACE_ONLY(x) + #define NOT_DTRACE(x) x +@@ -40,9 +41,15 @@ + #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) {;} ++#define DTRACE_PROBE6(a,b,c,d,e,f,g,h) {;} ++#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) {;} + + #endif + ++#if defined(SOLARIS) ++// Solaris dtrace needs actual extern function decls. + #define HS_DTRACE_PROBE_FN(provider,name)\ + __dtrace_##provider##___##name + +@@ -50,6 +57,13 @@ + 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 @@ + #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 @@ + 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)) ++#else ++// Systemtap dtrace compatible probes on GNU/Linux use direct macros. ++#define HS_DTRACE_PROBE(provider,name) HS_DTRACE_PROBE0(provider,name) ++#define HS_DTRACE_PROBE0(provider,name)\ ++ DTRACE_PROBE(provider,name) ++#define HS_DTRACE_PROBE1(provider,name,a0)\ ++ DTRACE_PROBE1(provider,name,a0) ++#define HS_DTRACE_PROBE2(provider,name,a0,a1)\ ++ DTRACE_PROBE2(provider,name,a0,a1) ++#define HS_DTRACE_PROBE3(provider,name,a0,a1,a2)\ ++ DTRACE_PROBE3(provider,name,a0,a1,a2) ++#define HS_DTRACE_PROBE4(provider,name,a0,a1,a2,a3)\ ++ DTRACE_PROBE4(provider,name,a0,a1,a2,a3) ++#define HS_DTRACE_PROBE5(provider,name,a0,a1,a2,a3,a4)\ ++ DTRACE_PROBE5(provider,name,a0,a1,a2,a3,a4) ++#define HS_DTRACE_PROBE6(provider,name,a0,a1,a2,a3,a4,a5)\ ++ DTRACE_PROBE6(provider,name,a0,a1,a2,a3,a4,a5) ++#define HS_DTRACE_PROBE7(provider,name,a0,a1,a2,a3,a4,a5,a6)\ ++ DTRACE_PROBE7(provider,name,a0,a1,a2,a3,a4,a5,a6) ++#define HS_DTRACE_PROBE8(provider,name,a0,a1,a2,a3,a4,a5,a6,a7)\ ++ 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) ++#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 +@@ -2272,16 +2272,16 @@ + FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false); + FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true); + } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) { +-#ifdef SOLARIS ++#ifdef DTRACE_ENABLED + FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true); + FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true); + FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true); + FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true); +-#else // ndef SOLARIS ++#else // ndef DTRACE_ENABLED + jio_fprintf(defaultStream::error_stream(), +- "ExtendedDTraceProbes flag is only applicable on Solaris\n"); ++ "ExtendedDTraceProbes flag is only applicable on dtrace enabled builds\n"); + return JNI_EINVAL; +-#endif // ndef SOLARIS ++#endif // ndef DTRACE_ENABLED + } else + #ifdef ASSERT + if (match_option(option, "-XX:+FullGCALot", &tail)) { From ahughes at redhat.com Wed May 20 11:51:26 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:51:26 +0000 Subject: changeset in /hg/icedtea: SystemTap forwardport. Message-ID: changeset 88af6aafd853 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=88af6aafd853 description: SystemTap forwardport. 2009-04-29 Andrew John Hughes * Makefile.am: Use abs_top_builddir to locate generated Systemtap file. 2009-04-28 Mark Wielaard * tapset/hotspot.stp.in: New systemtap tapset for hotspot. * configure.ac: Add check for abs-install-dir when --enable-systemtap is given. * Makefile.am (icedtea.stamp): Install tapsets. (icedtea-debug.stamp): Likewise. * .hgignore: Add tapset/hotspot.stp. diffstat: 5 files changed, 467 insertions(+) .hgignore | 1 ChangeLog | 15 + Makefile.am | 5 configure.ac | 17 + tapset/hotspot.stp.in | 429 +++++++++++++++++++++++++++++++++++++++++++++++++ diffs (truncated from 508 to 500 lines): diff -r 87de14662618 -r 88af6aafd853 .hgignore --- a/.hgignore Wed May 20 19:38:42 2009 +0100 +++ b/.hgignore Wed May 20 19:42:04 2009 +0100 @@ -33,6 +33,7 @@ jvm.cfg jvm.cfg ergo.c hotspot-tools/ +tapset/hotspot.stp test/hotspot test/jdk test/langtools diff -r 87de14662618 -r 88af6aafd853 ChangeLog --- a/ChangeLog Wed May 20 19:38:42 2009 +0100 +++ b/ChangeLog Wed May 20 19:42:04 2009 +0100 @@ -1,3 +1,18 @@ 2009-03-27 Mark Wielaard + + * Makefile.am: + Use abs_top_builddir to locate generated + Systemtap file. + +2009-04-28 Mark Wielaard + + * tapset/hotspot.stp.in: New systemtap tapset for hotspot. + * configure.ac: Add check for abs-install-dir when + --enable-systemtap is given. + * Makefile.am (icedtea.stamp): Install tapsets. + (icedtea-debug.stamp): Likewise. + * .hgignore: Add tapset/hotspot.stp. + 2009-03-27 Mark Wielaard * patches/icedtea-systemtap.patch: New patch. diff -r 87de14662618 -r 88af6aafd853 Makefile.am --- a/Makefile.am Wed May 20 19:38:42 2009 +0100 +++ b/Makefile.am Wed May 20 19:42:04 2009 +0100 @@ -2601,6 +2601,11 @@ if WITH_VISUALVM cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if ENABLE_SYSTEMTAP + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + cp $(abs_top_builddir)/tapset/*.stp \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset +endif cp $(NETX_RESOURCE_DIR)/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib diff -r 87de14662618 -r 88af6aafd853 configure.ac --- a/configure.ac Wed May 20 19:38:42 2009 +0100 +++ b/configure.ac Wed May 20 19:42:04 2009 +0100 @@ -412,6 +412,23 @@ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUN AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], [SDT_H_FOUND='no'; AC_MSG_ERROR([systemtap support needs sys/sdt.h header])]) + + AC_MSG_CHECKING([for absolute java home install dir]) + AC_ARG_WITH([abs-install-dir], + [AS_HELP_STRING([--with-abs-install-dir], + [The absolute path where the j2sdk-image dir will be installed])], + [if test "x${withval}" = x; then + ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image" + else + ABS_JAVA_HOME_DIR="${withval}" + fi], [ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image"]) + AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) + ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" + ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" + AC_SUBST(ABS_JAVA_HOME_DIR) + AC_SUBST(ABS_CLIENT_LIBJVM_SO) + AC_SUBST(ABS_SERVER_LIBJVM_SO) + AC_CONFIG_FILES([tapset/hotspot.stp]) fi dnl Check for libpng headers and libraries. diff -r 87de14662618 -r 88af6aafd853 tapset/hotspot.stp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tapset/hotspot.stp.in Wed May 20 19:42:04 2009 +0100 @@ -0,0 +1,429 @@ +/* hotspot systemtap tapset. + Copyright (C) 2009, Red Hat Inc. + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea 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 for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. +*/ + +/* + Currently only works with full path in process probes below. + When things don't seem to work look if the correct + jre/lib/[arch]/[client|server]/libjvm.so is used + and exists under @ABS_JAVA_HOME_DIR@/. + This version of hotspot.stp has been configured to instrument the + libjvm.so for arch @INSTALL_ARCH_DIR@ installed at: + @ABS_CLIENT_LIBJVM_SO@ + @ABS_SERVER_LIBJVM_SO@ + + Each probe defines the probe name and a full probestr which consists + of the probe name and between brackets all argument names and values. + */ + +/* hotspot.gc_begin + * Triggeres when a system wide garbage collection begins. + * Sets is_full if this is a full garbage collect. + */ +probe hotspot.gc_begin = + process("@ABS_CLIENT_LIBJVM_SO@").mark("gc__begin"), + process("@ABS_SERVER_LIBJVM_SO@").mark("gc__begin") +{ + name = "gc_begin"; + is_full = $arg1; + probestr = sprintf("%s(is_full=%d)", name, is_full); +} + +/* hotspot.gc_end + Triggers when a system wide garbage collection ends. + Has no arguments. + */ +probe hotspot.gc_end = + process("@ABS_CLIENT_LIBJVM_SO@").mark("gc__begin"), + process("@ABS_SERVER_LIBJVM_SO@").mark("gc__begin") +{ + name = "gc_end"; + probestr = name; +} + + +/* hotspot.mem_pool_gc_begin + Triggers when a memory pool collection begins. + Sets manager to the manager name that controls this memory pool + (e.g. 'Copy' or 'MarkSweepCompact'), pool to the pool name (e.g. + 'Code Cache', 'Eden Space', 'Survivor Space', 'Tenured Gen', or + 'Perm Gen'), initial to the initial byte size of the pool, used + to the number bytes in use, committed to the number of committed + pages and max to the maximum size of the pool. + */ +probe hotspot.mem_pool_gc_begin = + process("@ABS_CLIENT_LIBJVM_SO@").mark("mem__pool__gc__begin"), + process("@ABS_SERVER_LIBJVM_SO@").mark("mem__pool__gc__begin") +{ + name = "mem_pool_gc_begin"; + manager = user_string_n($arg1, $arg2); + pool = user_string_n($arg3, $arg4); + initial = $arg5; + used = $arg6; + committed = $arg7; + max = $arg8; + probestr = sprintf("%s(manager='%s',pool='%s',initial=%d,used=%d,committed=%d,max=%d)", + name, manager, pool, initial, used, committed, max); +} + +/* hotspot.mem_pool_gc_end + Triggers when a memory pool collection ends. + Sets manager to the manager name that controls this memory pool + (e.g. 'Copy' or 'MarkSweepCompact'), pool to the pool name (e.g. + 'Code Cache', 'Eden Space', 'Survivor Space', 'Tenured Gen', or + 'Perm Gen'), initial to the initial byte size of the pool, used + to the number bytes in use, committed to the number of committed + pages and max to the maximum size of the pool. + */ +probe hotspot.mem_pool_gc_end = + process("@ABS_CLIENT_LIBJVM_SO@").mark("mem__pool__gc__end"), + process("@ABS_SERVER_LIBJVM_SO@").mark("mem__pool__gc__end") +{ + name = "mem_pool_gc_end"; + manager = user_string_n($arg1, $arg2); + pool = user_string_n($arg3, $arg4); + initial = $arg5; + used = $arg6; + committed = $arg7; + max = $arg8; + probestr = sprintf("%s(manager='%s',pool='%s',initial=%d,used=%d,committed=%d,max=%d)", + name, manager, pool, initial, used, committed, max); +} + +/* hotspot.object_alloc (extended probe) + Triggers whenever an object is allocated. + Sets thread_id to the current thread id, class to the class name + of the object allocated, and size to the size of the object. + Needs -XX:+ExtendedDTraceProbes. + */ +probe hotspot.object_alloc = + process("@ABS_CLIENT_LIBJVM_SO@").mark("object__alloc"), + process("@ABS_SERVER_LIBJVM_SO@").mark("object__alloc") +{ + name = "object_alloc"; + thread_id = $arg1; + class = user_string_n($arg2, $arg3); + size = $arg3; + probestr = sprintf("%s(thread_id=%d,class='%s',size=0x%x)", + name, thread_id, class, size); +} + +/* hotspot.vm_init_begin + Triggers at the beginning of the virtual machine initialization. + Has no arguments + */ +probe hotspot.vm_init_begin = + process("@ABS_CLIENT_LIBJVM_SO@").mark("vm__init__begin"), + process("@ABS_SERVER_LIBJVM_SO@").mark("vm__init__begin") +{ + name = "vm_init_begin"; + probestr = name; +} + +/* hotspot.vm_init_end + Triggers at the end of the virtual machine initialization. + Has no arguments. + */ +probe hotspot.vm_init_end = + process("@ABS_CLIENT_LIBJVM_SO@").mark("vm__init__end"), + process("@ABS_SERVER_LIBJVM_SO@").mark("vm__init__end") +{ + name = "vm_init_end"; + probestr = name; +} + +/* hotspot.vm_shutdown + Triggers at the shutdown of the virtual machine initialization. + Has no arguments. + */ +probe hotspot.vm_shutdown = + process("@ABS_CLIENT_LIBJVM_SO@").mark("vm__shutdown"), + process("@ABS_SERVER_LIBJVM_SO@").mark("vm__shutdown") +{ + name = "vm_shutdown"; + probestr = name; +} + +/* hotspot.thread_start + Triggers when a java thread is started. + Sets name to the name of the thread, id to the java thread id, + native_id to the os thread number and is_daemon if the thread + is a daemon thread. + */ +probe hotspot.thread_start = + process("@ABS_CLIENT_LIBJVM_SO@").mark("thread__start"), + process("@ABS_SERVER_LIBJVM_SO@").mark("thread__start") +{ + name = "thread_start"; + thread_name = user_string_n($arg1, $arg2); + id = $arg3; + native_id = $arg4; + is_daemon = $arg5; + probestr = sprintf("%s(thread_name='%s',id=%d,native_id=%d,is_daemon=%d)", + name, thread_name, id, native_id, is_daemon); +} + +/* hotspot.thread_stop + Triggers when a java thread stops. + Sets name to the name of the thread, id to the java thread id, + native_id to the os thread number and is_daemon if the thread + is a daemon thread. + */ +probe hotspot.thread_stop = + process("@ABS_CLIENT_LIBJVM_SO@").mark("thread__stop"), + process("@ABS_SERVER_LIBJVM_SO@").mark("thread__stop") +{ + name = "thread_stop"; + thread_name = user_string_n($arg1, $arg2); + id = $arg3; + native_id = $arg4; + is_daemon = $arg5; + probestr = sprintf("%s(thread_name='%s',id=%d,native_id=%d,is_daemon=%d)", + name, thread_name, id, native_id, is_daemon); +} + +/* hotspot.class_loaded + Triggers when a class is loaded. + Sets name to the loaded class name, classloader_id to the id + of the classloader that loaded this class and is_shared if the + class was loaded from a shared archive. + */ +probe hotspot.class_loaded = + process("@ABS_CLIENT_LIBJVM_SO@").mark("class__loaded"), + process("@ABS_SERVER_LIBJVM_SO@").mark("class__loaded") +{ + name = "class_loaded"; + class = user_string_n($arg1, $arg2); + classloader_id = $arg3; + is_shared = $arg4; + probestr = sprintf("%s(class='%s',classloader_id=0x%x,is_shared=%d)", + name, class, classloader_id, is_shared); +} + +/* hotspot.class_unloaded + Triggers when a class is unloaded. + Sets name to the loaded class name, classloader_id to the id + of the classloader that loaded this class and is_shared if the + class was loaded from a shared archive. + */ +probe hotspot.class_unloaded = + process("@ABS_CLIENT_LIBJVM_SO@").mark("class__unloaded"), + process("@ABS_SERVER_LIBJVM_SO@").mark("class__unloaded") +{ + name = "class_unloaded"; + class = user_string_n($arg1, $arg2); + classloader_id = $arg3; + is_shared = $arg4; + probestr = sprintf("%s(class='%s',classloader_id=0x%x,is_shared=%d)", + name, class, classloader_id, is_shared); +} + +/* hotspot.method_compile_begin + Triggers when a method is being compiled. + Sets compiler to the name of the compiler (e.g. 'C1' or 'C2'), + class to the name of the class, method to the name of the method, + and sig to the signature string of the method. +*/ +probe hotspot.method_compile_begin = + process("@ABS_CLIENT_LIBJVM_SO@").mark("method__compile__begin"), + process("@ABS_SERVER_LIBJVM_SO@").mark("method__compile__begin") +{ + name = "method_compile_begin"; + compiler = user_string_n($arg1, $arg2); + class = user_string_n($arg3, $arg4); + method = user_string_n($arg5, $arg6); + sig = user_string_n($arg7, $arg8); + probestr = name . "(compiler='" . compiler . "',class='" . class + . "',method='" . method . "',sig='" . sig . "')"; +} + +/* hotspot.method_compile_end + Triggers when a method has been compiled. + Sets compiler to the name of the compiler (e.g. 'C1' or 'C2'), + class to the name of the class, method to the name of the method, + and sig to the signature string of the method. +*/ +probe hotspot.method_compile_end = + process("@ABS_CLIENT_LIBJVM_SO@").mark("method__compile__end"), + process("@ABS_SERVER_LIBJVM_SO@").mark("method__compile__end") +{ + name = "method_compile_end"; + compiler = user_string_n($arg1, $arg2); + class = user_string_n($arg3, $arg4); + method = user_string_n($arg5, $arg6); + sig = user_string_n($arg7, $arg8); + probestr = name . "(compiler='" . compiler . "',class='" . class + . "',method='" . method . "',sig='" . sig . "')"; +} + +/* hotspot.monitor_wait (extended probe) + Triggers when a thread enters Object.wait(). + Sets thread_id to the current java thread, id to the unique id + for this monitor, class to the class name of the object and + timeout to the number of ms given (or zero for waiting indefinitely). + Needs -XX:+ExtendedDTraceProbes. + */ +probe hotspot.monitor_wait = + process("@ABS_CLIENT_LIBJVM_SO@").mark("monitor__wait"), + process("@ABS_SERVER_LIBJVM_SO@").mark("monitor__wait") +{ + name = "monitor_wait"; + thread_id = $arg1; + id = $arg2; + class = user_string_n($arg3, $arg4); + timeout = $arg5; + probestr = sprintf("%s(thread_id=%d,id=0x%x,class='%s',timeout=%d)", + name, thread_id, id, class, timeout); +} + +/* hotspot.monitor_waited (extended probe) + Triggers when a thread exits Object.wait(). + 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_waited = + process("@ABS_CLIENT_LIBJVM_SO@").mark("monitor__waited"), + process("@ABS_SERVER_LIBJVM_SO@").mark("monitor__waited") +{ + name = "monitor_waited"; + thread_id = $arg1; + id = $arg2; + class = user_string_n($arg3, $arg4); + probestr = sprintf("%s(thread_id=%d,id=0x%x,class='%s')", + name, thread_id, id, class); +} + +/* Doesn't resolve atm. + 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") +{ + name = "monitor_notify"; + thread_id = $arg1; + id = $arg2; + class = user_string_n($arg3, $arg4); + 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(). + 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_notifyAll = + process("@ABS_CLIENT_LIBJVM_SO@").mark("monitor__notifyAll"), + process("@ABS_SERVER_LIBJVM_SO@").mark("monitor__notifyAll") +{ + name = "monitor_notifyAll"; + thread_id = $arg1; + id = $arg2; + class = user_string_n($arg3, $arg4); + probestr = sprintf("%s(thread_id=%d,id=0x%x,class='%s')", + name, thread_id, id, class); +} + +/* hotspot.monitor_contended_enter (extended probe) + Triggers when a thread tries to acquire a monitor (syncronized block) + which is currently held by another thread (that other thread will + exit the monitor triggering hotspot.monitor_contended_exit at a + later time). + 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_contended_enter = + process("@ABS_CLIENT_LIBJVM_SO@").mark("monitor__contended__enter"), + process("@ABS_SERVER_LIBJVM_SO@").mark("monitor__contended__enter") +{ + name = "monitor_contended_enter"; + thread_id = $arg1; + id = $arg2; + class = user_string_n($arg3, $arg4); + probestr = sprintf("%s(thread_id=%d,id=0x%x,class='%s')", + name, thread_id, id, class); +} + +/* hotspot.monitor_contended_enter (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). + 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_contended_entered = + process("@ABS_CLIENT_LIBJVM_SO@").mark("monitor__contended__entered"), + process("@ABS_SERVER_LIBJVM_SO@").mark("monitor__contended__entered") +{ + name = "monitor_contended_entered"; + thread_id = $arg1; + id = $arg2; + class = user_string_n($arg3, $arg4); + probestr = sprintf("%s(thread_id=%d,id=0x%x,class='%s')", + name, thread_id, id, class); +} + +/* hotspot.monitor_contended_exit (extended probe) + Triggers when a thread tries to exit a monitor (synchronized block) + that another thread wants to enter (the other thread has triggered + hotspot.monitor_contended_enter). + 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_contended_exit = + process("@ABS_CLIENT_LIBJVM_SO@").mark("monitor__contended__exit"), + process("@ABS_SERVER_LIBJVM_SO@").mark("monitor__contended__exit") +{ + name = "monitor_contended_exit"; + thread_id = $arg1; + id = $arg2; + class = user_string_n($arg3, $arg4); + probestr = sprintf("%s(thread_id=%d,id=0x%x,class='%s')", + name, thread_id, id, class); +} + +// Doesn't work yet. +// method__entry +// method__return + +// Missing +// compiled__method__load +// compiled__method__unload + +// Extra private probes +// hashtable__new_entry From ahughes at redhat.com Wed May 20 11:51:26 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:51:26 +0000 Subject: changeset in /hg/icedtea: SystemTap forwardport. Message-ID: changeset 7a561e7b887e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7a561e7b887e description: SystemTap forwardport. 2009-04-29 Mark Wielaard * README: Document systemtap support. * INSTALL: Document build requirements for systemtap support. * NEWS: Mention systemtap support. diffstat: 4 files changed, 36 insertions(+) ChangeLog | 6 ++++++ INSTALL | 9 +++++++++ NEWS | 7 +++++++ README | 14 ++++++++++++++ diffs (68 lines): diff -r 88af6aafd853 -r 7a561e7b887e ChangeLog --- a/ChangeLog Wed May 20 19:42:04 2009 +0100 +++ b/ChangeLog Wed May 20 19:43:38 2009 +0100 @@ -1,3 +1,9 @@ 2009-04-29 Andrew John Hughes + + * README: Document systemtap support. + * INSTALL: Document build requirements for systemtap support. + * NEWS: Mention systemtap support. + 2009-04-29 Andrew John Hughes * Makefile.am: diff -r 88af6aafd853 -r 7a561e7b887e INSTALL --- a/INSTALL Wed May 20 19:42:04 2009 +0100 +++ b/INSTALL Wed May 20 19:43:38 2009 +0100 @@ -42,6 +42,15 @@ netbeans = 6.5 netbeans = 6.5 For building the zero-assembler port (see below), you will need libffi. + +For building with systemtap support (--enable-systemtap), you will need +systemtap-sdt-devel (available since systemtap 0.9.5). This also needs +the --with-abs-install-dir configure option to make sure the hotspot.stp.in +tapset gets the correct installation location for the libjvm.so, it +defaults to the root of the j2sdk-image build dir otherwise (but then +you cannot move that to another location without adjusting the paths +in the tapset/hotspot.stp file. For example: + --enable-systemtap --with-abs-install-dir=/usr/lib/jvm/java-1.6.0-openjdk See ./configure --help if you need to override the defaults. diff -r 88af6aafd853 -r 7a561e7b887e NEWS --- a/NEWS Wed May 20 19:42:04 2009 +0100 +++ b/NEWS Wed May 20 19:43:38 2009 +0100 @@ -1,4 +1,11 @@ New in release 1.10 (XXXX-XX-XX) New in release 1.10 (XXXX-XX-XX) + +- Static trace support through systemtap. + When given the configure option --enable-systemtap IcedTea will build + hotspot with the dtrace static markers enabled and install an hotspot + tapset that can be used to dynamically trace execution of java + applications at runtime. See the tapset/hotspot.stp file for + documentation of the various trace points and arguments available. New in release 1.9 (2009-03-20) diff -r 88af6aafd853 -r 7a561e7b887e README --- a/README Wed May 20 19:42:04 2009 +0100 +++ b/README Wed May 20 19:43:38 2009 +0100 @@ -169,3 +169,17 @@ PulseAudio Mixer Passing --enable-pulse-java to configure will build the PulseAudio Mixer for java. This allows java programs to use PulseAudio as the sound backend. + +Systemtap support +================= + +The --enable-systemtap configure option will try to find the systemtap +runtime development files (sdt.h and the dtrace python script wrapper), +enable compilation of static markers in the hotspot code and install a +systemtap hotspot.stp tapset for easy tracing with systemtap's stap +utility. The probes are documented in tapset/hotspot.stp. + +This requires the systemtap-sdt-devel package as build dependency and +optionally the systemtap package at run time when the user want to use +the tapset to trace java programs. The probes have zero overhead when +not used and can safely be compiled in even when not used at runtime. From ahughes at redhat.com Wed May 20 11:51:27 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 18:51:27 +0000 Subject: changeset in /hg/icedtea: Forwardport SystemTap Message-ID: changeset 0a36fab09f89 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0a36fab09f89 description: Forwardport SystemTap 2009-05-04 Mark Wielaard * Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp when client not available (ENABLE_SYSTEMTAP only). (icedtea-debug.stamp): Likewise. diffstat: 2 files changed, 30 insertions(+), 5 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 29 ++++++++++++++++++++++++----- diffs (65 lines): diff -r 7a561e7b887e -r 0a36fab09f89 ChangeLog --- a/ChangeLog Wed May 20 19:43:38 2009 +0100 +++ b/ChangeLog Wed May 20 19:51:45 2009 +0100 @@ -1,3 +1,9 @@ 2009-04-29 Mark Wielaard + + * Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp + when client not available (ENABLE_SYSTEMTAP only). + (icedtea-debug.stamp): Likewise. + 2009-04-29 Mark Wielaard * README: Document systemtap support. diff -r 7a561e7b887e -r 0a36fab09f89 Makefile.am --- a/Makefile.am Wed May 20 19:43:38 2009 +0100 +++ b/Makefile.am Wed May 20 19:51:45 2009 +0100 @@ -2601,17 +2601,24 @@ if WITH_VISUALVM cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif -if ENABLE_SYSTEMTAP - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ - cp $(abs_top_builddir)/tapset/*.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset -endif cp $(NETX_RESOURCE_DIR)/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib cp $(NETX_RESOURCE_DIR)/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib +if ENABLE_SYSTEMTAP + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ + if test $$? -eq 0; then \ + sed -e '/\/client\/libjvm.so/d' \ + < $(abs_top_builddir)/tapset/hotspot.stp \ + > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + else \ + cp $(abs_top_builddir)/tapset/hotspot.stp \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + fi +endif @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) mkdir -p stamps touch stamps/icedtea.stamp @@ -2671,6 +2678,18 @@ endif cp $(NETX_RESOURCE_DIR)/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib +if ENABLE_SYSTEMTAP + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ + if test $$? -eq 0; then \ + sed -e '/\/client\/libjvm.so/d' \ + < $(abs_top_builddir)/tapset/hotspot.stp \ + > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + else \ + cp $(abs_top_builddir)/tapset/hotspot.stp \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + fi +endif @echo "IcedTea (debug build) is served:" \ $(BUILD_OUTPUT_DIR)-debug mkdir -p stamps From doko at ubuntu.com Wed May 20 12:25:00 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Wed, 20 May 2009 19:25:00 +0000 Subject: changeset in /hg/icedtea: 2009-05-05 Matthias Klose changeset a0a5d904139d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a0a5d904139d description: 2009-05-05 Matthias Klose * configure.ac: Building --with-additional-vms=zero and srcdir != builddir doesn't work. diffstat: 2 files changed, 8 insertions(+) ChangeLog | 5 +++++ configure.ac | 3 +++ diffs (25 lines): diff -r 7409d7ed0c8b -r a0a5d904139d ChangeLog --- a/ChangeLog Wed May 20 20:26:00 2009 +0100 +++ b/ChangeLog Tue May 05 16:57:03 2009 +0200 @@ -1,3 +1,8 @@ 2009-05-03 Matthias Klose + + * configure.ac: Building --with-additional-vms=zero and + srcdir != builddir doesn't work. + 2009-05-03 Matthias Klose * Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally diff -r 7409d7ed0c8b -r a0a5d904139d configure.ac --- a/configure.ac Wed May 20 20:26:00 2009 +0100 +++ b/configure.ac Tue May 05 16:57:03 2009 +0200 @@ -580,6 +580,9 @@ if test "x${USE_SYSTEM_CACAO_TRUE}" = x; if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then AC_MSG_ERROR([cannot build with system cacao as additional vm]) fi +if test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${abs_top_builddir}" = "x${abs_top_srcdir}"; then + AC_MSG_ERROR([build of additional zero/shark VM requires build with srcdir != builddir]) +fi if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then dnl Check for libffi headers and libraries. From ahughes at redhat.com Wed May 20 12:24:58 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 19:24:58 +0000 Subject: changeset in /hg/icedtea: Forwardport --with-additional-vms supp... Message-ID: changeset f06356634030 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f06356634030 description: Forwardport --with-additional-vms support. 2009-05-01 Matthias Klose * patches/cacao/launcher.patch: Create new thread depending on the current VM. * Makefile.am (ICEDTEA_PATCHES): Apply unconditionally. (icedtea-against-icedtea): Add dependencies on stamps/add-cacao.stamp, stamps/add-zero.stamp. (icedtea-debug-against-icedtea): Add dependencies on stamps/add-cacao-debug.stamp, stamps/add-zero-debug.stamp. (stamps/add-{cacao,zero}{,-debug}.stamp: New. (clean, stamps/download.stamp, clean-download, stamps/extract.stamp stamps/cacao.stamp): Use BUILD_CACAO instead of WITH_CACAO. (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): Add VM aliases for cacao and zero when configured as ZERO_BUILD or WITH_CACAO. * configure.ac: New option --with-additional-vms=, new conditionals ADD_CACAO_BUILD, ADD_ZERO_BUILD, ADD_SHARK_BUILD, BUILD_CACAO. diffstat: 8 files changed, 268 insertions(+), 20 deletions(-) ChangeLog | 17 ++++ HACKING | 3 INSTALL | 17 ++++ Makefile.am | 147 +++++++++++++++++++++++++++++++++++++++--- NEWS | 4 + README | 18 +++++ configure.ac | 40 ++++++++++- patches/cacao/launcher.patch | 42 ++++++++++-- diffs (471 lines): diff -r 0a36fab09f89 -r f06356634030 ChangeLog --- a/ChangeLog Wed May 20 19:51:45 2009 +0100 +++ b/ChangeLog Wed May 20 20:23:37 2009 +0100 @@ -1,3 +1,20 @@ 2009-05-04 Mark Wielaard + + * patches/cacao/launcher.patch: Create new thread depending on the + current VM. + * Makefile.am (ICEDTEA_PATCHES): Apply unconditionally. + (icedtea-against-icedtea): Add dependencies on stamps/add-cacao.stamp, + stamps/add-zero.stamp. + (icedtea-debug-against-icedtea): Add dependencies on + stamps/add-cacao-debug.stamp, stamps/add-zero-debug.stamp. + (stamps/add-{cacao,zero}{,-debug}.stamp: New. + (clean, stamps/download.stamp, clean-download, stamps/extract.stamp + stamps/cacao.stamp): Use BUILD_CACAO instead of WITH_CACAO. + (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): Add VM aliases + for cacao and zero when configured as ZERO_BUILD or WITH_CACAO. + * configure.ac: New option --with-additional-vms=, new conditionals + ADD_CACAO_BUILD, ADD_ZERO_BUILD, ADD_SHARK_BUILD, BUILD_CACAO. + 2009-05-04 Mark Wielaard * Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp diff -r 0a36fab09f89 -r f06356634030 HACKING --- a/HACKING Wed May 20 19:51:45 2009 +0100 +++ b/HACKING Wed May 20 20:23:37 2009 +0100 @@ -70,6 +70,7 @@ The following patches are currently appl * icedtea-cc-interp-backedge.patch: Remove some duplicated code in DO_BACKEDGE_CHECKS. * icedtea-includedb.patch: Add missing include files. (S6793825, mostly applied in b47) * icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295). +* cacao/launcher.patch: For the 'java' command, create new thread depending on the current VM. The following patches are only applied to OpenJDK6 in IcedTea6: @@ -157,8 +158,6 @@ The following patches are only applied w * icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel. The following patches are only applied when building with the CACAO virtual machine: - -* icedtea-cacao.patch: Don't run 'java' in a new thread. The following patches are to support Xrender pipeline (-Dsun.java2d.xrender): diff -r 0a36fab09f89 -r f06356634030 INSTALL --- a/INSTALL Wed May 20 19:51:45 2009 +0100 +++ b/INSTALL Wed May 20 20:23:37 2009 +0100 @@ -114,3 +114,20 @@ 0.99.3 during the build. To use a diffe --with-cacao-home= to point to an existing installation which use the Sun VM interface. +Building additional virtual machines +------------------------------------ + +Although IcedTea can be built multiple times to use a different virtual +machine, addtional VM's can be built without building the other components +multiple times. + +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 +default VM, and zero as additional VM. + +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-'. diff -r 0a36fab09f89 -r f06356634030 Makefile.am --- a/Makefile.am Wed May 20 19:51:45 2009 +0100 +++ b/Makefile.am Wed May 20 20:23:37 2009 +0100 @@ -75,8 +75,13 @@ if ENABLE_PLUGIN if ENABLE_PLUGIN rm -f IcedTeaPlugin.o IcedTeaPlugin.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 @@ -1748,7 +1753,7 @@ endif $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \ fi endif -if WITH_CACAO +if BUILD_CACAO if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP else @@ -1826,7 +1831,7 @@ clean-download: clean-download: rm -f stamps/download.stamp rm -f $(OPENJDK_SRC_ZIP) -if WITH_CACAO +if BUILD_CACAO rm -f $(CACAO_SRC_ZIP) endif if WITH_VISUALVM @@ -1969,6 +1974,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-xml-encodinginfo.patch \ patches/icedtea-cc-interp-backedge.patch \ + patches/cacao/launcher.patch \ $(DISTRIBUTION_PATCHES) if WITH_RHINO @@ -1978,7 +1984,6 @@ endif if WITH_CACAO ICEDTEA_PATCHES += \ - patches/cacao/launcher.patch \ patches/cacao/ignore-tests.patch endif @@ -2114,7 +2119,7 @@ endif touch stamps/extract.stamp stamps/extract-cacao.stamp: stamps/extract.stamp -if WITH_CACAO +if BUILD_CACAO if !USE_SYSTEM_CACAO if ! test -d cacao ; \ then \ @@ -2607,6 +2612,12 @@ endif cp $(NETX_RESOURCE_DIR)/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib +if ZERO_BUILD + printf -- '-zero 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 if ENABLE_SYSTEMTAP mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ @@ -2678,6 +2689,12 @@ endif cp $(NETX_RESOURCE_DIR)/default.jnlp \ extra-lib/about.jar \ $(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 WITH_CACAO + printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif if ENABLE_SYSTEMTAP mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ @@ -2703,11 +2720,15 @@ clean-icedtea: stamps/download.stamp icedtea-against-icedtea: \ stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea.stamp + stamps/icedtea.stamp \ + stamps/add-cacao.stamp \ + stamps/add-zero.stamp icedtea-debug-against-icedtea: \ stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea-debug.stamp + stamps/icedtea-debug.stamp \ + stamps/add-cacao-debug.stamp \ + stamps/add-zero-debug.stamp # OpenJDK ecj Targets # =================== @@ -3012,10 +3033,10 @@ endif touch $@ stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp -if WITH_CACAO +if BUILD_CACAO if !USE_SYSTEM_CACAO cd cacao/cacao && \ - ./configure \ + $(ARCH_PREFIX) ./configure \ --host=$(host_alias) \ --build=$(build_alias) \ --target=$(target_alias) \ @@ -3024,7 +3045,7 @@ if !USE_SYSTEM_CACAO --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \ --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \ - make -j$(PARALLEL_JOBS) install + $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install endif endif mkdir -p stamps @@ -3153,6 +3174,114 @@ endif endif # end of pulse-java + +# targets for additional VMs + +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) + +stamps/add-cacao.stamp: stamps/icedtea.stamp stamps/cacao.stamp +if ADD_CACAO_BUILD + mkdir -p $(BUILD_JRE_ARCH_DIR)/cacao + install -m 644 cacao/install/lib/libjvm.so \ + $(BUILD_JRE_ARCH_DIR)/cacao/ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ + $(BUILD_JRE_ARCH_DIR)/cacao/ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ + $(BUILD_JRE_ARCH_DIR)/cacao/ + printf -- '-cacao KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +else + printf -- '-cacao ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + +stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp +if ADD_CACAO_BUILD + mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao + install -m 644 cacao/install/lib/libjvm.so \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ + printf -- '-cacao KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +else + printf -- '-cacao ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + + +# configure script arguments, quoted in single quotes +CONFIGURE_ARGS = @CONFIGURE_ARGS@ +ADD_ZERO_CONFIGURE_ARGS = \ + --with-openjdk \ + --with-openjdk-home=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + --enable-zero +if ADD_SHARK_BUILD +ADD_ZERO_CONFIGURE_ARGS += \ + --enable-shark +endif +ADD_ZERO_CONFIGURE_ARGS += \ + --disable-docs \ + $(filter-out '--with-gcj-home=% '--with-ecj=% \ + '--with-java=% '--with-javah=% \ + '--with-rmic=% '--with-additional-vms=% \ + '--with-icedtea '--with-icedtea-home=% \ + '--with-openjdk '--with-openjdk-home=% , \ + $(CONFIGURE_ARGS)) + +ADD_ZERO_EXTRA_BUILD_ENV = \ + BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \ + BUILD_JAXP=false ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \ + BUILD_JAXWS=false ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \ + BUILD_CORBA=false ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \ + BUILD_JDK=false + +stamps/add-zero.stamp: stamps/icedtea.stamp +if ADD_ZERO_BUILD + mkdir -p zerovm + + for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ + cd zerovm && \ + $(ADD_ZERO_EXTRA_BUILD_ENV) \ + $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) + + for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ + $(ADD_ZERO_EXTRA_BUILD_ENV) \ + $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET) + + 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 +else + printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + +stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp +if ADD_ZERO_BUILD + mkdir -p zerovm + + for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ + cd zerovm && \ + $(ADD_ZERO_EXTRA_BUILD_ENV) \ + $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) + + for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ + $(ADD_ZERO_EXTRA_BUILD_ENV) \ + $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET) + + 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 +else + printf -- '-zero ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + +# end additional VMs # jtreg diff -r 0a36fab09f89 -r f06356634030 NEWS --- a/NEWS Wed May 20 19:51:45 2009 +0100 +++ b/NEWS Wed May 20 20:23:37 2009 +0100 @@ -6,6 +6,10 @@ New in release 1.10 (XXXX-XX-XX) tapset that can be used to dynamically trace execution of java applications at runtime. See the tapset/hotspot.stp file for documentation of the various trace points and arguments available. +- Allow building of other virtual machines besides the default VM. Additional + virtual machines on architectures where hotspot is available are cacao + and zero (or shark), and cacao, where zero (or shark) is available. It's + not possible to build cacao as the default VM, and zero as additional VM. New in release 1.9 (2009-03-20) diff -r 0a36fab09f89 -r f06356634030 README --- a/README Wed May 20 19:51:45 2009 +0100 +++ b/README Wed May 20 20:23:37 2009 +0100 @@ -183,3 +183,21 @@ optionally the systemtap package at run optionally the systemtap package at run time when the user want to use the tapset to trace java programs. The probes have zero overhead when not used and can safely be compiled in even when not used at runtime. + +Support for additional VMs +========================== + +Although IcedTea can be built multiple times to use a different virtual +machine, addtional VM's can be built without building the other components +multiple times. + +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 +default VM, and zero as additional VM. + +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-'. diff -r 0a36fab09f89 -r f06356634030 configure.ac --- a/configure.ac Wed May 20 19:51:45 2009 +0100 +++ b/configure.ac Wed May 20 20:23:37 2009 +0100 @@ -549,7 +549,39 @@ else fi fi -if test "x${ZERO_BUILD_TRUE}" = x; then +AC_MSG_CHECKING(for --with-additional-vms) +AC_ARG_WITH(additional-vms, + AC_HELP_STRING([--with-additional-vms=vm1,vm2,...], [build additional virtual machines. Valid value is a colon separated string with the backend names `cacao', `zero' and `shark'.]), +[ +if test x$with_additional_vms != x +then + for vm in `echo $with_additional_vms | sed 's/,/ /g'`; do + case "x$vm" in + xcacao) add_vm_cacao=yes;; + xzero) add_vm_zero=yes;; + xshark) add_vm_shark=yes;; + *) AC_MSG_ERROR([proper usage is --with-additional-vms=vm1,vm2,...]) + esac + done +fi]) +AC_MSG_RESULT($with_additional_vms) + +AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x) +AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x) +AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x) +AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes) + +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 + AC_MSG_ERROR([additional vm is the default vm]) +fi +if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then + AC_MSG_ERROR([cannot build with system cacao as additional vm]) +fi + +if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then dnl Check for libffi headers and libraries. PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no]) if test "x${LIBFFI_FOUND}" = xno @@ -567,7 +599,7 @@ AC_SUBST(LIBFFI_CFLAGS) AC_SUBST(LIBFFI_CFLAGS) AC_SUBST(LIBFFI_LIBS) -if test "x${SHARK_BUILD_TRUE}" = x; then +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_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \ @@ -581,4 +613,8 @@ AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LIBS) +# Arguments passed to configure. +AC_SUBST(CONFIGURE_ARGS) +CONFIGURE_ARGS="$ac_configure_args" + AC_OUTPUT diff -r 0a36fab09f89 -r f06356634030 patches/cacao/launcher.patch --- a/patches/cacao/launcher.patch Wed May 20 19:51:45 2009 +0100 +++ b/patches/cacao/launcher.patch Wed May 20 20:23:37 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/docs/Mak diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile ---- openjdk.orig/jdk/make/docs/Makefile 2009-03-19 16:10:56.000000000 +0000 -+++ openjdk/jdk/make/docs/Makefile 2009-03-19 16:12:59.000000000 +0000 +--- openjdk.orig/jdk/make/docs/Makefile 2009-05-19 01:11:05.000000000 +0100 ++++ openjdk/jdk/make/docs/Makefile 2009-05-20 20:17:49.000000000 +0100 @@ -36,7 +36,7 @@ ifeq ($(ARCH_DATA_MODEL),64) MAX_VM_MEMORY = 1024 @@ -11,15 +11,43 @@ diff -Nru openjdk.orig/jdk/make/docs/Mak # diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c ---- openjdk.orig/jdk/src/share/bin/java.c 2009-03-19 16:10:56.000000000 +0000 -+++ openjdk/jdk/src/share/bin/java.c 2009-03-19 16:18:16.000000000 +0000 -@@ -1873,7 +1873,8 @@ +--- openjdk.orig/jdk/src/share/bin/java.c 2009-05-19 01:11:05.000000000 +0100 ++++ openjdk/jdk/src/share/bin/java.c 2009-05-20 20:22:14.000000000 +0100 +@@ -175,6 +175,8 @@ + InvocationFunctions ifn; + } JavaMainArgs; + ++#define JNI_VERSION_CACAO 0xcaca0000 ++ + /* + * Entry point. + */ +@@ -1871,6 +1873,8 @@ + + { /* Create a new thread to create JVM and invoke main method */ + JavaMainArgs args; ++ struct JDK1_1InitArgs cacao_args; ++ int jvm_init_rv; + int rslt; + + args.argc = argc; +@@ -1879,7 +1883,18 @@ args.classname = classname; args.ifn = *ifn; - rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); -+ /*rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args);*/ -+ rslt = JavaMain((void*)&args); ++ memset((void*)&cacao_args, 0, sizeof(cacao_args)); ++ cacao_args.version = JNI_VERSION_CACAO; ++ ++ jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args); ++ if (_launcher_debug) ++ printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no"); ++ ++ if (jvm_init_rv == 0) ++ return JavaMain((void*)&args); ++ else ++ return ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); ++ /* If the caller has deemed there is an error we * simply return that, otherwise we return the value of * the callee From ahughes at redhat.com Wed May 20 12:24:59 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 19:24:59 +0000 Subject: changeset in /hg/icedtea: Forwardport --with-additional-vms supp... Message-ID: changeset 7409d7ed0c8b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7409d7ed0c8b description: Forwardport --with-additional-vms support. 2009-05-03 Matthias Klose * Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally on BUILD_CACAO. (ADD_ZERO_EXTRA_BUILD_ENV): Filter out cacao patches passed in DISTRIBUTION_PATCHES. (stamps/add-zero.stamp, stamps/add-zero-debug.stamp): Remove obsolete unset commands. diffstat: 2 files changed, 16 insertions(+), 6 deletions(-) ChangeLog | 9 +++++++++ Makefile.am | 13 +++++++------ diffs (71 lines): diff -r f06356634030 -r 7409d7ed0c8b ChangeLog --- a/ChangeLog Wed May 20 20:23:37 2009 +0100 +++ b/ChangeLog Wed May 20 20:26:00 2009 +0100 @@ -1,3 +1,12 @@ 2009-05-01 Matthias Klose + + * Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally + on BUILD_CACAO. + (ADD_ZERO_EXTRA_BUILD_ENV): Filter out cacao patches passed in + DISTRIBUTION_PATCHES. + (stamps/add-zero.stamp, stamps/add-zero-debug.stamp): Remove obsolete + unset commands. + 2009-05-01 Matthias Klose * patches/cacao/launcher.patch: Create new thread depending on the diff -r f06356634030 -r 7409d7ed0c8b Makefile.am --- a/Makefile.am Wed May 20 20:23:37 2009 +0100 +++ b/Makefile.am Wed May 20 20:26:00 2009 +0100 @@ -1974,12 +1974,16 @@ ICEDTEA_PATCHES = \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-xml-encodinginfo.patch \ patches/icedtea-cc-interp-backedge.patch \ - patches/cacao/launcher.patch \ $(DISTRIBUTION_PATCHES) if WITH_RHINO ICEDTEA_PATCHES += \ patches/icedtea-rhino.patch +endif + +if BUILD_CACAO +ICEDTEA_PATCHES += \ + patches/cacao/launcher.patch endif if WITH_CACAO @@ -3235,18 +3239,17 @@ ADD_ZERO_EXTRA_BUILD_ENV = \ BUILD_JAXP=false ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \ BUILD_JAXWS=false ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \ BUILD_CORBA=false ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \ - BUILD_JDK=false + BUILD_JDK=false \ + DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))' stamps/add-zero.stamp: stamps/icedtea.stamp if ADD_ZERO_BUILD mkdir -p zerovm - for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ cd zerovm && \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) - for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET) @@ -3263,12 +3266,10 @@ if ADD_ZERO_BUILD if ADD_ZERO_BUILD mkdir -p zerovm - for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ cd zerovm && \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) - for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET) From langel at redhat.com Wed May 20 12:26:25 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 20 May 2009 19:26:25 +0000 Subject: changeset in /hg/icedtea: 2009-05-05 Lillian Angel changeset 9b2352187669 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9b2352187669 description: 2009-05-05 Lillian Angel Fixes BZ#313 * Makefile.am (hotspot): Fixes paths and creates server directory before copy. diffstat: 2 files changed, 10 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 6 ++++-- diffs (35 lines): diff -r a0a5d904139d -r 9b2352187669 ChangeLog --- a/ChangeLog Tue May 05 16:57:03 2009 +0200 +++ b/ChangeLog Tue May 05 11:26:38 2009 -0400 @@ -1,3 +1,9 @@ 2009-05-05 Matthias Klose + + Fixes BZ#313 + * Makefile.am + (hotspot): Fixes paths and creates server directory before copy. + 2009-05-05 Matthias Klose * configure.ac: Building --with-additional-vms=zero and diff -r a0a5d904139d -r 9b2352187669 Makefile.am --- a/Makefile.am Tue May 05 16:57:03 2009 +0200 +++ b/Makefile.am Tue May 05 11:26:38 2009 -0400 @@ -2757,14 +2757,16 @@ stamps/icedtea-ecj.stamp: stamps/bootstr mkdir -p stamps touch stamps/icedtea-ecj.stamp -SERVER_DIR = hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/server +SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server hotspot: rm -f stamps/bootstrap-directory-symlink-ecj.stamp rm -f stamps/icedtea-ecj.stamp rm -f stamps/icedtea-against-ecj.stamp $(ARCH_PREFIX) $(MAKE) hotspot-helper + mkdir -p \ + $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ - $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/server + $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \ From ahughes at redhat.com Wed May 20 12:42:02 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 19:42:02 +0000 Subject: changeset in /hg/icedtea: Forwardport Mark Wielaard's autotools ... Message-ID: changeset db595a21b09d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=db595a21b09d description: Forwardport Mark Wielaard's autotools downgrade patch. 2009-05-04 Mark Wielaard * autogen.sh: Lower requirements to autoconf 2.59 and automake 1.9.6. * configure.ac (AM_INIT_AUTOMAKE): Require 1.9 or higher. (abs_top_builddir): Explicitly define. (abs_top_srcdir): Likewise. (additional-vms): Rewrite help string and description. * missing: Remove generated file (autogen.sh). diffstat: 4 files changed, 32 insertions(+), 380 deletions(-) ChangeLog | 9 + autogen.sh | 22 +-- configure.ac | 14 +- missing | 367 ---------------------------------------------------------- diffs (truncated from 502 to 500 lines): diff -r 9b2352187669 -r db595a21b09d ChangeLog --- a/ChangeLog Tue May 05 11:26:38 2009 -0400 +++ b/ChangeLog Wed May 20 20:31:58 2009 +0100 @@ -1,3 +1,12 @@ 2009-05-05 Lillian Angel + + * autogen.sh: Lower requirements to autoconf 2.59 and automake 1.9.6. + * configure.ac (AM_INIT_AUTOMAKE): Require 1.9 or higher. + (abs_top_builddir): Explicitly define. + (abs_top_srcdir): Likewise. + (additional-vms): Rewrite help string and description. + * missing: Remove generated file (autogen.sh). + 2009-05-05 Lillian Angel Fixes BZ#313 diff -r 9b2352187669 -r db595a21b09d autogen.sh --- a/autogen.sh Tue May 05 11:26:38 2009 -0400 +++ b/autogen.sh Wed May 20 20:31:58 2009 +0100 @@ -8,10 +8,10 @@ HAVE_AUTOCONF=false for AUTOCONF in autoconf autoconf259; do if ${AUTOCONF} --version > /dev/null 2>&1; then - AUTOCONF_VERSION=`${AUTOCONF} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + AUTOCONF_VERSION=`${AUTOCONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTOCONF_VERSION} case ${AUTOCONF_VERSION} in - 2.6[1-9]* ) + 2.59* | 2.6[0-9]* ) HAVE_AUTOCONF=true break; ;; @@ -25,7 +25,7 @@ HAVE_AUTOHEADER=false for AUTOHEADER in autoheader autoheader259; do if ${AUTOHEADER} --version > /dev/null 2>&1; then - AUTOHEADER_VERSION=`${AUTOHEADER} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + AUTOHEADER_VERSION=`${AUTOHEADER} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTOHEADER_VERSION} case ${AUTOHEADER_VERSION} in 2.59* | 2.6[0-9]* ) @@ -42,7 +42,7 @@ HAVE_AUTORECONF=false for AUTORECONF in autoreconf; do if ${AUTORECONF} --version > /dev/null 2>&1; then - AUTORECONF_VERSION=`${AUTORECONF} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + AUTORECONF_VERSION=`${AUTORECONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTORECONF_VERSION} case ${AUTORECONF_VERSION} in 2.59* | 2.6[0-9]* ) @@ -55,7 +55,7 @@ done if test ${HAVE_AUTOCONF} = false; then echo "No proper autoconf was found." - echo "You must have autoconf 2.61 or later installed." + echo "You must have autoconf 2.59 or later installed." exit 1 fi @@ -80,10 +80,10 @@ HAVE_ACLOCAL=false for ACLOCAL in aclocal aclocal-1.10; do if ${ACLOCAL} --version > /dev/null 2>&1; then - ACLOCAL_VERSION=`${ACLOCAL} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + ACLOCAL_VERSION=`${ACLOCAL} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${ACLOCAL_VERSION} case ${ACLOCAL_VERSION} in - 1.1[0-9]* ) + 1.9.[6-9] | 1.1[0-9]* ) HAVE_ACLOCAL=true break; ;; @@ -97,10 +97,10 @@ HAVE_AUTOMAKE=false for AUTOMAKE in automake automake-1.10; do if ${AUTOMAKE} --version > /dev/null 2>&1; then - AUTOMAKE_VERSION=`${AUTOMAKE} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + AUTOMAKE_VERSION=`${AUTOMAKE} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo ${AUTOMAKE_VERSION} case ${AUTOMAKE_VERSION} in - 1.1[0-9]* ) + 1.9.[6-9] | 1.1[0-9]* ) HAVE_AUTOMAKE=true break; ;; @@ -110,13 +110,13 @@ done if test ${HAVE_ACLOCAL} = false; then echo "No proper aclocal was found." - echo "You must have automake 1.10 or later installed." + echo "You must have automake 1.9.6 or later installed." exit 1 fi if test ${HAVE_AUTOMAKE} = false; then echo "No proper automake was found." - echo "You must have automake 1.10 or later installed." + echo "You must have automake 1.9.6 or later installed." exit 1 fi diff -r 9b2352187669 -r db595a21b09d configure.ac --- a/configure.ac Tue May 05 11:26:38 2009 -0400 +++ b/configure.ac Wed May 20 20:31:58 2009 +0100 @@ -1,6 +1,16 @@ AC_INIT([icedtea], [1.10-pre], [distro-p AC_INIT([icedtea], [1.10-pre], [distro-pkg-dev at openjdk.java.net]) -AM_INIT_AUTOMAKE([1.10 tar-pax foreign]) +AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) + +# Older automake doesn't generate these correctly +abs_top_builddir=`pwd -P` +AC_SUBST(abs_top_builddir) +abs_top_srcdir=`dirname $0` +cd $abs_top_srcdir +abs_top_srcdir=`pwd` +cd $abs_top_builddir +AC_SUBST(abs_top_srcdir) + AC_CANONICAL_HOST AC_PREFIX_DEFAULT([bootstrap]) @@ -551,7 +561,7 @@ fi AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms, - AC_HELP_STRING([--with-additional-vms=vm1,vm2,...], [build additional virtual machines. Valid value is a colon separated string with the backend names `cacao', `zero' and `shark'.]), + AC_HELP_STRING([--with-additional-vms=vm-list], [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]), [ if test x$with_additional_vms != x then diff -r 9b2352187669 -r db595a21b09d missing --- a/missing Tue May 05 11:26:38 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,367 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2006-05-10.23 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program 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 for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case $1 in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $1 in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" From dbhole at redhat.com Wed May 20 12:42:02 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 20 May 2009 19:42:02 +0000 Subject: changeset in /hg/icedtea: Add conditional compilation to accomod... Message-ID: changeset 3ab9b1133b7d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3ab9b1133b7d description: Add conditional compilation to accomodate changed api in xulrunner 1.9.1 diffstat: 4 files changed, 62 insertions(+) ChangeLog | 8 ++++++++ IcedTeaPlugin.cc | 4 ++++ Makefile.am | 1 + configure.ac | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ diffs (100 lines): diff -r db595a21b09d -r 3ab9b1133b7d ChangeLog --- a/ChangeLog Wed May 20 20:31:58 2009 +0100 +++ b/ChangeLog Tue May 05 17:04:37 2009 -0400 @@ -1,3 +1,11 @@ 2009-05-04 Mark Wielaard + + * IcedTeaPlugin.cc: Add conditional compilation block. + * Makefile.am: Define a collapsed (comparable) version when compiling the + plugin. + * configure.ac: Determine a collapsed (comparable) version that can be + used by the preprocessor for conditional compilation. + 2009-05-04 Mark Wielaard * autogen.sh: Lower requirements to autoconf 2.59 and automake 1.9.6. diff -r db595a21b09d -r 3ab9b1133b7d IcedTeaPlugin.cc --- a/IcedTeaPlugin.cc Wed May 20 20:31:58 2009 +0100 +++ b/IcedTeaPlugin.cc Tue May 05 17:04:37 2009 -0400 @@ -3788,7 +3788,11 @@ IcedTeaPluginFactory::StartAppletviewer } PLUGIN_DEBUG_TWO ("created output fifo:", out_pipe_name); +#if MOZILLA_VERSION_COLLAPSED < 1090100 result = applet_viewer_process->Run (PR_FALSE, args, numArgs, nsnull); +#else + result = applet_viewer_process->Run (PR_FALSE, args, numArgs); +#endif PLUGIN_CHECK_RETURN ("run process", result); out_to_appletviewer = g_io_channel_new_file (out_pipe_name, diff -r db595a21b09d -r 3ab9b1133b7d Makefile.am --- a/Makefile.am Wed May 20 20:31:58 2009 +0100 +++ b/Makefile.am Tue May 05 17:04:37 2009 -0400 @@ -3075,6 +3075,7 @@ IcedTeaPlugin.o: IcedTeaPlugin.cc $(CXX) $(CXXFLAGS) \ -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ -DPLUGIN_VERSION="\"$$plugin_version\"" \ + -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \ $(GTK_CFLAGS) \ $(XULRUNNER_CFLAGS) \ -fPIC -c -o $@ $< diff -r db595a21b09d -r 3ab9b1133b7d configure.ac --- a/configure.ac Wed May 20 20:31:58 2009 +0100 +++ b/configure.ac Tue May 05 17:04:37 2009 -0400 @@ -559,6 +559,55 @@ else fi fi +AC_LANG_PUSH([C++]) +OLDCPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" + +AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +#include +#include +#include +#include +#include +]],[[ +int version = 0; +const char* token = NULL; +int power=6; +FILE *datafile; + +datafile = fopen ("conftest.vdata", "w"); +if (!datafile) return 1; + +// 32 chars is more than enough to hold version +char* mozilla_version = (char*) malloc(32*sizeof(char)); +snprintf(mozilla_version, 32, "%s", MOZILLA_VERSION); + +token = strtok(mozilla_version, "."); +while (token) +{ + version += atoi(token)*(pow(10, power)); + power -=2; + token = strtok(NULL, "."); +} + +fprintf (datafile, "%d\n", version); +free(mozilla_version); +if (fclose(datafile)) return 1; + +return EXIT_SUCCESS; +]])], + [xulrunner_cv_collapsed_version="$(cat conftest.vdata)"], + [AC_MSG_FAILURE([cannot determine xulrunner version])])], + [xulrunner_cv_collapsed_version="190000"]) + +CPPFLAGS="$OLDCPPFLAGS" +AC_LANG_POP([C++]) + +AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) + + AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms, AC_HELP_STRING([--with-additional-vms=vm-list], [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]), From ahughes at redhat.com Wed May 20 12:42:03 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 19:42:03 +0000 Subject: changeset in /hg/icedtea: Cleanup XULRunner version check. Message-ID: changeset 9fdc241371af in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9fdc241371af description: Cleanup XULRunner version check. 2009-05-20 Andrew John Hughes * acinclude.m4: (IT_XULRUNNER_VERSION): New macro. * configure.ac: Move XULRunner version check to its own macro and only execute when the plugin is turned on. diffstat: 3 files changed, 67 insertions(+), 105 deletions(-) ChangeLog | 9 ++++ acinclude.m4 | 51 ++++++++++++++++++++++++++ configure.ac | 112 +++------------------------------------------------------- diffs (196 lines): diff -r 3ab9b1133b7d -r 9fdc241371af ChangeLog --- a/ChangeLog Tue May 05 17:04:37 2009 -0400 +++ b/ChangeLog Wed May 20 20:43:04 2009 +0100 @@ -1,3 +1,12 @@ 2009-05-05 Deepak Bhole + + * acinclude.m4: + (IT_XULRUNNER_VERSION): New macro. + * configure.ac: + Move XULRunner version check to its + own macro and only execute when the plugin + is turned on. + 2009-05-05 Deepak Bhole * IcedTeaPlugin.cc: Add conditional compilation block. diff -r 3ab9b1133b7d -r 9fdc241371af acinclude.m4 --- a/acinclude.m4 Tue May 05 17:04:37 2009 -0400 +++ b/acinclude.m4 Wed May 20 20:43:04 2009 +0100 @@ -1447,3 +1447,54 @@ AC_DEFUN([AC_CHECK_ENABLE_NIMBUS], AM_CONDITIONAL(ENABLE_NIMBUS, test x"${ENABLE_NIMBUS}" = "xyes") AC_SUBST(ENABLE_NIMBUS) ]) + +AC_DEFUN([IT_XULRUNNER_VERSION], +[ +AC_LANG_PUSH([C++]) +OLDCPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" + +AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +#include +#include +#include +#include +#include +]],[[ +int version = 0; +const char* token = NULL; +int power=6; +FILE *datafile; + +datafile = fopen ("conftest.vdata", "w"); +if (!datafile) return 1; + +// 32 chars is more than enough to hold version +char* mozilla_version = (char*) malloc(32*sizeof(char)); +snprintf(mozilla_version, 32, "%s", MOZILLA_VERSION); + +token = strtok(mozilla_version, "."); +while (token) +{ + version += atoi(token)*(pow(10, power)); + power -=2; + token = strtok(NULL, "."); +} + +fprintf (datafile, "%d\n", version); +free(mozilla_version); +if (fclose(datafile)) return 1; + +return EXIT_SUCCESS; +]])], + [xulrunner_cv_collapsed_version="$(cat conftest.vdata)"], + [AC_MSG_FAILURE([cannot determine xulrunner version])])], + [xulrunner_cv_collapsed_version="190000"]) + +CPPFLAGS="$OLDCPPFLAGS" +AC_LANG_POP([C++]) + +AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) +]) diff -r 3ab9b1133b7d -r 9fdc241371af configure.ac --- a/configure.ac Tue May 05 17:04:37 2009 -0400 +++ b/configure.ac Wed May 20 20:43:04 2009 +0100 @@ -502,111 +502,13 @@ fi dnl Check for plugin support headers and libraries. dnl FIXME: use unstable -if test "x${enable_gcjwebplugin}" = "xyes" -then - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - PKG_CHECK_MODULES(MOZILLA, iceape-plugin iceape-xpcom, \ - [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno - then - AC_MSG_ERROR([Could not find plugin support headers and libraries.]) - fi - - PKG_CHECK_MODULES(GLIB, glib-2.0) - PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0 gdk-pixbuf-2.0) - - AC_SUBST(MOZILLA_CFLAGS) - AC_SUBST(MOZILLA_LIBS) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -else - if test "x${enable_plugin}" = "xyes" - then - PKG_CHECK_MODULES(XULRUNNER, \ - nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9) - PKG_CHECK_MODULES(GTK, gtk+-2.0) - fi -fi - -AC_LANG_PUSH([C++]) -OLDCPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" - -AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ -#include -#include -#include -#include -#include -]],[[ -int version = 0; -const char* token = NULL; -int power=6; -FILE *datafile; - -datafile = fopen ("conftest.vdata", "w"); -if (!datafile) return 1; - -// 32 chars is more than enough to hold version -char* mozilla_version = (char*) malloc(32*sizeof(char)); -snprintf(mozilla_version, 32, "%s", MOZILLA_VERSION); - -token = strtok(mozilla_version, "."); -while (token) -{ - version += atoi(token)*(pow(10, power)); - power -=2; - token = strtok(NULL, "."); -} - -fprintf (datafile, "%d\n", version); -free(mozilla_version); -if (fclose(datafile)) return 1; - -return EXIT_SUCCESS; -]])], - [xulrunner_cv_collapsed_version="$(cat conftest.vdata)"], - [AC_MSG_FAILURE([cannot determine xulrunner version])])], - [xulrunner_cv_collapsed_version="190000"]) - -CPPFLAGS="$OLDCPPFLAGS" -AC_LANG_POP([C++]) - -AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) - +if test "x${enable_plugin}" = "xyes" +then + PKG_CHECK_MODULES(XULRUNNER, \ + nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9) + PKG_CHECK_MODULES(GTK, gtk+-2.0) + IT_XULRUNNER_VERSION +fi AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms, From langel at redhat.com Wed May 20 13:00:21 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 20 May 2009 16:00:21 -0400 Subject: [RFC]: Minor plugin fix Message-ID: <4A146155.9050903@redhat.com> Hi Deepak, This patch fixes this bug: https://bugzilla.redhat.com/show_bug.cgi?id=501391 Lillian Angel * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of certs outside of loop, so it is not reset during each iteration. diff -r e810f0b2a98b rt/net/sourceforge/jnlp/tools/JarSigner.java --- a/rt/net/sourceforge/jnlp/tools/JarSigner.java Tue May 19 16:23:15 2009 +0200 +++ b/rt/net/sourceforge/jnlp/tools/JarSigner.java Wed May 20 15:57:53 2009 -0400 @@ -199,12 +199,12 @@ public void verifyJars(List jars, ResourceTracker tracker) throws Exception { + certs = new ArrayList(); for (int i = 0; i < jars.size(); i++) { JARDesc jar = (JARDesc) jars.get(i); verifiedJars = new ArrayList(); unverifiedJars = new ArrayList(); - certs = new ArrayList(); try { From dbhole at redhat.com Wed May 20 13:14:24 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 20 May 2009 16:14:24 -0400 Subject: [RFC]: Minor plugin fix In-Reply-To: <4A146155.9050903@redhat.com> References: <4A146155.9050903@redhat.com> Message-ID: <20090520201424.GE23091@redhat.com> * Lillian Angel [2009-05-20 16:00]: > Hi Deepak, > > This patch fixes this bug: > > https://bugzilla.redhat.com/show_bug.cgi?id=501391 > > Lillian Angel > > * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of certs > outside of loop, so it is not reset during each iteration. > > > diff -r e810f0b2a98b rt/net/sourceforge/jnlp/tools/JarSigner.java > --- a/rt/net/sourceforge/jnlp/tools/JarSigner.java Tue May 19 > 16:23:15 2009 +0200 > +++ b/rt/net/sourceforge/jnlp/tools/JarSigner.java Wed May 20 > 15:57:53 2009 -0400 > @@ -199,12 +199,12 @@ > public void verifyJars(List jars, ResourceTracker tracker) > throws Exception { > > + certs = new ArrayList(); > for (int i = 0; i < jars.size(); i++) { > > JARDesc jar = (JARDesc) jars.get(i); > verifiedJars = new ArrayList(); > unverifiedJars = new ArrayList(); > - certs = new ArrayList(); > > try { > Indentation looks a bit off ("certs ..." should start at the same column as the "for ..."). Other than that, looks good. After fixing above, please go ahead and commit. Cheers, Deepak From langel at redhat.com Wed May 20 13:13:34 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 20 May 2009 20:13:34 +0000 Subject: changeset in /hg/icedtea6: 2009-05-20 Lillian Angel changeset 456c81041a91 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=456c81041a91 description: 2009-05-20 Lillian Angel * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of certs outside of loop, so it is not reset during each iteration. diffstat: 2 files changed, 6 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ rt/net/sourceforge/jnlp/tools/JarSigner.java | 2 +- diffs (29 lines): diff -r e810f0b2a98b -r 456c81041a91 ChangeLog --- a/ChangeLog Tue May 19 16:23:15 2009 +0200 +++ b/ChangeLog Wed May 20 16:14:38 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-18 Robert Schuster + + * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of + certs outside of loop, so it is not reset during each iteration. + 2009-05-18 Robert Schuster * configure.ac: Make xulrunner compilation check optional. diff -r e810f0b2a98b -r 456c81041a91 rt/net/sourceforge/jnlp/tools/JarSigner.java --- a/rt/net/sourceforge/jnlp/tools/JarSigner.java Tue May 19 16:23:15 2009 +0200 +++ b/rt/net/sourceforge/jnlp/tools/JarSigner.java Wed May 20 16:14:38 2009 -0400 @@ -199,12 +199,12 @@ public class JarSigner implements CertVe public void verifyJars(List jars, ResourceTracker tracker) throws Exception { + certs = new ArrayList(); for (int i = 0; i < jars.size(); i++) { JARDesc jar = (JARDesc) jars.get(i); verifiedJars = new ArrayList(); unverifiedJars = new ArrayList(); - certs = new ArrayList(); try { From langel at redhat.com Wed May 20 13:23:27 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 20 May 2009 16:23:27 -0400 Subject: [RFC]: Minor plugin fix In-Reply-To: <20090520201424.GE23091@redhat.com> References: <4A146155.9050903@redhat.com> <20090520201424.GE23091@redhat.com> Message-ID: <4A1466BF.9000904@redhat.com> Deepak Bhole wrote: > * Lillian Angel [2009-05-20 16:00]: > >> Hi Deepak, >> >> This patch fixes this bug: >> >> https://bugzilla.redhat.com/show_bug.cgi?id=501391 >> >> Lillian Angel >> >> * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of certs >> outside of loop, so it is not reset during each iteration. >> >> >> diff -r e810f0b2a98b rt/net/sourceforge/jnlp/tools/JarSigner.java >> --- a/rt/net/sourceforge/jnlp/tools/JarSigner.java Tue May 19 >> 16:23:15 2009 +0200 >> +++ b/rt/net/sourceforge/jnlp/tools/JarSigner.java Wed May 20 >> 15:57:53 2009 -0400 >> @@ -199,12 +199,12 @@ >> public void verifyJars(List jars, ResourceTracker tracker) >> throws Exception { >> >> + certs = new ArrayList(); >> for (int i = 0; i < jars.size(); i++) { >> >> JARDesc jar = (JARDesc) jars.get(i); >> verifiedJars = new ArrayList(); >> unverifiedJars = new ArrayList(); >> - certs = new ArrayList(); >> >> try { >> >> > > Indentation looks a bit off ("certs ..." should start at the same column > as the "for ..."). Other than that, looks good. After fixing above, > please go ahead and commit. Yep, all good. Committed also to the release branch, since it is a very minor fix. Fully tested. Lillian From ahughes at redhat.com Wed May 20 13:31:05 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 20:31:05 +0000 Subject: changeset in /hg/icedtea: Always apply Zero/Shark patches. Message-ID: changeset bbac5c54022b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bbac5c54022b description: Always apply Zero/Shark patches. 2009-05-20 Andrew John Hughes * HACKING: Updated. 2009-05-08 Gary Benson * Makefile.am: Always apply Zero and Shark patches. * patches/icedtea-test-atomic-operations.patch: Only test on Zero. * HACKING: Updated. diffstat: 4 files changed, 37 insertions(+), 62 deletions(-) ChangeLog | 10 +++++ HACKING | 49 +++++++++----------------- Makefile.am | 36 +++---------------- patches/icedtea-test-atomic-operations.patch | 4 +- diffs (176 lines): diff -r 9fdc241371af -r bbac5c54022b ChangeLog --- a/ChangeLog Wed May 20 20:43:04 2009 +0100 +++ b/ChangeLog Wed May 20 20:50:48 2009 +0100 @@ -1,3 +1,13 @@ 2009-05-20 Andrew John Hughes + + * HACKING: Updated. + +2009-05-08 Gary Benson + + * Makefile.am: Always apply Zero and Shark patches. + * patches/icedtea-test-atomic-operations.patch: Only test on Zero. + * HACKING: Updated. + 2009-05-20 Andrew John Hughes * acinclude.m4: diff -r 9fdc241371af -r bbac5c54022b HACKING --- a/HACKING Wed May 20 20:43:04 2009 +0100 +++ b/HACKING Wed May 20 20:50:48 2009 +0100 @@ -97,6 +97,14 @@ The following patches are only applied t * icedtea-timerqueue.patch: Fix setting of running variable (PR87/S6623943). * icedtea-version.patch: Fix (langtools) ant build to honor fcs MILESTONE setting (S6778493). * icedtea-io_util-overflow.patch: Replace some code to correctly handle overflows. (S6788196) +* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. +* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef. +* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. +* icedtea-signature-iterator.patch: Add zero-specific signature handling. +* icedtea-signed-types.patch: Make use of unsigned/signed types explicit. +* 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. The following patches are only applied to OpenJDK in IcedTea: @@ -106,7 +114,6 @@ The following patches are only applied t is broken in libgcj 4.3. * icedtea-override.patch: Remove @Override annotation in javax.management.AttributeValueExp (unsupported by ecj < 3.4). -* icedtea-snmp.patch: Remove proprietary SNMP support hooks. The following patches are only applied to the icedtea-ecj bootstrap tree: @@ -127,37 +134,9 @@ The following patches are only applied t * ecj/icedtea-pr40188.patch: Fix names to refer to constants generated by gjavah. * ecj/icedtea-sbcs.patch: Fixes GenerateSBCS.java to not use java.util.Scanner. -The following patches are only applied for IcedTea builds using the zero-assembler: +The following patches are only applied when building with the CACAO virtual machine: -* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default. -* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485). -* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. -* icedtea-hotspot-6b12-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only). - - Never edit this patch. It should be regenerated by unzipping the - openjdk6 build you're using into openjdk6, and the openjdk7 build - you want to use into openjdk, then running: - diff -ruNb openjdk{6,}/hotspot/src/share > icedtea-hotspot-6bXX-7bYY.patch - diff -ruNb openjdk{6,}/hotspot/src/os/linux >> icedtea-hotspot-6bXX-7bYY.patch -* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef. -* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug. -* icedtea-signature-iterator.patch: Add zero-specific signature handling. -* icedtea-signed-types.patch: Make use of unsigned/signed types explicit. -* 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. - -The following patches are only applied for IcedTea builds not using the zero-assembler: - -* icedtea-signed-types-hot6.patch: Make use of unsigned/signed types explicit. - -The following patches are only applied for IcedTea builds using the Shark JIT: - -* icedtea-shark.patch: Add support for the Shark JIT. - -The following patches are only applied when building with experimental NetX plugin support: - -* icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel. - -The following patches are only applied when building with the CACAO virtual machine: +* cacao/ignore-tests.patch: Ignore tests known to fail on CACAO. The following patches are to support Xrender pipeline (-Dsun.java2d.xrender): @@ -200,3 +179,11 @@ XSL file (S6707485): Included upstream i * icedtea-license-headers.patch: Generate GPL header from automulti tool (PR148/S6713083). * icedtea-cc-interp-no-fer.patch: Replaced with icedtea-cc-interp-jvmti.patch, of which it is a subset. * icedtea-sound.patch: Remove proprietary MIDI support hooks. +* icedtea-hotspot-6b12-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only). + - Never edit this patch. It should be regenerated by unzipping the + openjdk6 build you're using into openjdk6, and the openjdk7 build + you want to use into openjdk, then running: + diff -ruNb openjdk{6,}/hotspot/src/share > icedtea-hotspot-6bXX-7bYY.patch + diff -ruNb openjdk{6,}/hotspot/src/os/linux >> icedtea-hotspot-6bXX-7bYY.patch +* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485). +* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. diff -r 9fdc241371af -r bbac5c54022b Makefile.am --- a/Makefile.am Wed May 20 20:43:04 2009 +0100 +++ b/Makefile.am Wed May 20 20:50:48 2009 +0100 @@ -1869,33 +1869,6 @@ stamps/ports.stamp: stamps/extract.stamp # when in an official bxx release) OPENJDK_PATCHES = -# If ZERO_BUILD is set then we are building zero. -ZERO_PATCHES = \ - patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ - patches/icedtea-signature-iterator.patch \ - patches/icedtea-test-atomic-operations.patch \ - patches/icedtea-zero.patch \ - patches/icedtea-ia64-bugfix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch - -# Patches needed when not using the newer OpenJDK 7 HotSpot for zero. -NON_ZERO_PATCHES = - -if ZERO_BUILD - ZERO_PATCHES_COND = $(ZERO_PATCHES) -else - ZERO_PATCHES_COND = -endif - -# If Shark is required, apply shark patch -if SHARK_BUILD - SHARK_PATCH = patches/hotspot/$(HSBUILD)/icedtea-shark.patch -else - SHARK_PATCH = -endif - -ICEDTEA_FSG_PATCHES = - ICEDTEA_PATCHES = \ patches/icedtea-version.patch \ patches/hotspot/$(HSBUILD)/icedtea-version.patch \ @@ -1949,7 +1922,7 @@ ICEDTEA_PATCHES = \ patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \ patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \ patches/icedtea-clean-crypto.patch \ - $(SHARK_PATCH) \ + patches/hotspot/$(HSBUILD)/icedtea-shark.patch \ $(GCC_PATCH) \ patches/icedtea-arch.patch \ patches/icedtea-signed-types.patch \ @@ -1965,7 +1938,12 @@ ICEDTEA_PATCHES = \ patches/icedtea-testenv.patch \ patches/icedtea-pr261.patch \ patches/icedtea-doc-headers.patch \ - $(ZERO_PATCHES_COND) \ + patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \ + patches/icedtea-signature-iterator.patch \ + patches/icedtea-test-atomic-operations.patch \ + patches/icedtea-zero.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 \ diff -r 9fdc241371af -r bbac5c54022b patches/icedtea-test-atomic-operations.patch --- a/patches/icedtea-test-atomic-operations.patch Wed May 20 20:43:04 2009 +0100 +++ b/patches/icedtea-test-atomic-operations.patch Wed May 20 20:50:48 2009 +0100 @@ -9,7 +9,7 @@ diff -r d384f5a5bd0c hotspot/src/share/v + // this is implemented using the GCC builtin __sync_lock_test_and_set + // which is not guaranteed to do what we're using it for on all + // platforms. So we check it works before doing anything else. -+#ifdef ASSERT ++#if defined(ZERO) && defined(ASSERT) + { + jint a = 0xCAFEBABE; + jint b = Atomic::xchg(0xC0FFEE, &a); @@ -18,7 +18,7 @@ diff -r d384f5a5bd0c hotspot/src/share/v + assert(a == 0xC0FFEE && b == (jint) 0xCAFEBABE, "Atomic::xchg() works"); + assert(c == &b && d == &a, "Atomic::xchg_ptr() works"); + } -+#endif // ASSERT ++#endif // ZERO & ASSERT + // At the moment it's only possible to have one Java VM, // since some of the runtime state is in global variables. From ahughes at redhat.com Wed May 20 13:31:07 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 20:31:07 +0000 Subject: changeset in /hg/icedtea: Update plugin and javaws. Message-ID: changeset 8dc304404e01 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8dc304404e01 description: Update plugin and javaws. 2009-05-13 Omair Majid * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. This new class is responsible for displaying the splash screen. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a splash screen if specified in the JNLP file while loading the remote jars. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java (getListener): Reposition the frame at the bottom right corner of the screen. 2009-05-13 Lillian Angel * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java (PluginAppletSecurityContext): Added comment. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (checkPermission): Fixed style. 2009-05-11 Lillian Angel * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java (getDefaultBaseDir): Added check for home dir. Return null if homeDir not found in system properties. 2009-05-11 Lillian Angel * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java (getDefaultBaseDir): Added null check. 2009-05-11 Lillian Angel * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java (getDefaultBaseDir): Set basedir for netx applications to ~/.netx, rather than asking. Now consistant with the plugin. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed. 2009-05-06 Lillian Angel Fixes bz#498108 * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java (runLoader): Pass false to JNLPRuntime.initialize, since this is an applet. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (PluginAppletSecurityContext): Likewise. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java (run): Pass true to JNLPRuntime.initialize, since this is a webstart app. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize): Added new parameter isApplication, which is used to set global static variable isWebstartApplication. (isWebstartApplication): New accessor function. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: (checkPermission): Added call to JNLPRuntime.isWebstartApplication so the check is bypassed if the permissions are to be checked for a webstart application. 2009-04-30 Deepak Bhole * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Forgo permission check if JS source is [System] (i.e. Mozilla extension/chrome). 2009-04-23 Deepak Bhole * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Handle nested jars. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java: Use site address when checking for policy against CodeSource. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java: Handle nested jars. 2009-04-10 Deepak Bhole * IcedTeaPlugin.cc: Fix rhbz478561 (freeze with empty string return from Java side). * plugin/icedtea/sun/applet/PluginMessageConsumer.java: Bump max workers from 3 to 20, limiting initial to 3, and growing if/when needed. 2009-04-02 Deepak Bhole * IcedTeaPlugin.cc: Incremented timeout to 3 minutes. Added functions to process proxy and auth info requests (the latter is unused). * plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java: New file. Displays a username/password input dialog to users for sites and proxies requiring http auth. * plugin/icedtea/sun/applet/PluginAppletViewer.java: Fix wait mechanism to detect applet initialization failures correctly. Add support for requesting proxy information from the browser. * plugin/icedtea/sun/applet/PluginCallRequestFactory.java: Add support for PluginProxyInfoRequest objects. * plugin/icedtea/sun/applet/PluginMain.java: Wire in custom authenticator and proxy selector. * plugin/icedtea/sun/applet/PluginProxyInfoRequest.java: New file. Object representing proxy information request from browser. * plugin/icedtea/sun/applet/PluginProxySelector.java: Custom proxy selector that requests information from browser and uses it. * plugin/icedtea/sun/applet/PluginStreamHandler.java: Improve handling code for "plugin specific" messages on the wire. * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java: Add support for improved initialization failure detection. diffstat: 22 files changed, 1096 insertions(+), 266 deletions(-) ChangeLog | 99 ++++ IcedTeaPlugin.cc | 174 ++++++- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java | 2 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java | 23 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java | 11 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 9 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java | 51 +- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/InstallDialog.java | 171 ------- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 86 ++- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 3 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 26 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 23 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java | 8 plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java | 241 ++++++++++ plugin/icedtea/sun/applet/PluginAppletSecurityContext.java | 4 plugin/icedtea/sun/applet/PluginAppletViewer.java | 63 ++ plugin/icedtea/sun/applet/PluginCallRequestFactory.java | 4 plugin/icedtea/sun/applet/PluginMain.java | 36 + plugin/icedtea/sun/applet/PluginMessageConsumer.java | 22 plugin/icedtea/sun/applet/PluginProxyInfoRequest.java | 85 +++ plugin/icedtea/sun/applet/PluginProxySelector.java | 195 ++++++++ plugin/icedtea/sun/applet/PluginStreamHandler.java | 26 - diffs (truncated from 1967 to 500 lines): diff -r bbac5c54022b -r 8dc304404e01 ChangeLog --- a/ChangeLog Wed May 20 20:50:48 2009 +0100 +++ b/ChangeLog Wed May 20 21:17:02 2009 +0100 @@ -1,3 +1,102 @@ 2009-05-20 Andrew John Hughes + + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. This new class + is responsible for displaying the splash screen. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a splash + screen if specified in the JNLP file while loading the remote jars. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java (getListener): + Reposition the frame at the bottom right corner of the screen. + +2009-05-13 Lillian Angel + + * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java + (PluginAppletSecurityContext): Added comment. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (checkPermission): Fixed style. + +2009-05-11 Lillian Angel + + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java + (getDefaultBaseDir): Added check for home dir. Return null if homeDir + not found in system properties. + +2009-05-11 Lillian Angel + + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java + (getDefaultBaseDir): Added null check. + +2009-05-11 Lillian Angel + + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java + (getDefaultBaseDir): Set basedir for netx applications to ~/.netx, + rather than asking. Now consistant with the plugin. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed. + +2009-05-06 Lillian Angel + + Fixes bz#498108 + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java + (runLoader): Pass false to JNLPRuntime.initialize, since this is an + applet. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (PluginAppletSecurityContext): Likewise. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java + (run): Pass true to JNLPRuntime.initialize, since this + is a webstart app. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java + (initialize): Added new parameter isApplication, which is used to set + global static variable isWebstartApplication. + (isWebstartApplication): New accessor function. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: + (checkPermission): Added call to JNLPRuntime.isWebstartApplication so + the check is bypassed if the permissions are to be checked for + a webstart application. + +2009-04-30 Deepak Bhole + + * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Forgo + permission check if JS source is [System] (i.e. Mozilla + extension/chrome). + +2009-04-23 Deepak Bhole + + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Handle nested + jars. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java: Use site address when + checking for policy against CodeSource. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java: Handle nested + jars. + +2009-04-10 Deepak Bhole + + * IcedTeaPlugin.cc: Fix rhbz478561 (freeze with empty string return from + Java side). + * plugin/icedtea/sun/applet/PluginMessageConsumer.java: Bump max workers + from 3 to 20, limiting initial to 3, and growing if/when needed. + +2009-04-02 Deepak Bhole + + * IcedTeaPlugin.cc: Incremented timeout to 3 minutes. Added functions to + process proxy and auth info requests (the latter is unused). + * plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java: New file. + Displays a username/password input dialog to users for sites and proxies + requiring http auth. + * plugin/icedtea/sun/applet/PluginAppletViewer.java: Fix wait mechanism to + detect applet initialization failures correctly. Add support for + requesting proxy information from the browser. + * plugin/icedtea/sun/applet/PluginCallRequestFactory.java: Add support for + PluginProxyInfoRequest objects. + * plugin/icedtea/sun/applet/PluginMain.java: Wire in custom authenticator + and proxy selector. + * plugin/icedtea/sun/applet/PluginProxyInfoRequest.java: New file. Object + representing proxy information request from browser. + * plugin/icedtea/sun/applet/PluginProxySelector.java: Custom proxy + selector that requests information from browser and uses it. + * plugin/icedtea/sun/applet/PluginStreamHandler.java: Improve handling + code for "plugin specific" messages on the wire. + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java: Add support for improved + initialization failure detection. + 2009-05-20 Andrew John Hughes * HACKING: Updated. diff -r bbac5c54022b -r 8dc304404e01 IcedTeaPlugin.cc --- a/IcedTeaPlugin.cc Wed May 20 20:50:48 2009 +0100 +++ b/IcedTeaPlugin.cc Wed May 20 21:17:02 2009 +0100 @@ -85,7 +85,7 @@ PRThread* current_thread (); // #14 0x0153fdbf in ProxyJNIEnv::CallObjectMethod (env=0xa8b8040, obj=0x9dad690, methodID=0xa0ed070) at ProxyJNI.cpp:641 // timeout (in seconds) for various calls to java side -#define TIMEOUT 20 +#define TIMEOUT 180 #define NOT_IMPLEMENTED() \ PLUGIN_DEBUG_1ARG ("NOT IMPLEMENTED: %s\n", __PRETTY_FUNCTION__) @@ -588,7 +588,7 @@ char const* TYPES[10] = { "Object", PLUGIN_DEBUG_0ARG ("RECEIVE VALUE 1\n"); \ ResultContainer *resultC; \ factory->result_map.Get(reference, &resultC); \ - while (resultC->returnValue == "" && \ + while (resultC->returnValue.IsVoid() == PR_TRUE && \ resultC->errorOccurred == PR_FALSE) \ { \ PROCESS_PENDING_EVENTS_REF (reference); \ @@ -607,7 +607,7 @@ char const* TYPES[10] = { "Object", PLUGIN_DEBUG_0ARG("RECEIVE SIZE 1\n"); \ ResultContainer *resultC; \ factory->result_map.Get(reference, &resultC); \ - while (resultC->returnValue == "" && \ + while (resultC->returnValue.IsVoid() == PR_TRUE && \ resultC->errorOccurred == PR_FALSE) \ { \ PROCESS_PENDING_EVENTS_REF (reference); \ @@ -631,7 +631,7 @@ char const* TYPES[10] = { "Object", PLUGIN_DEBUG_0ARG("RECEIVE STRING 1\n"); \ ResultContainer *resultC; \ factory->result_map.Get(reference, &resultC); \ - while (resultC->returnValue == "" && \ + while (resultC->returnValue.IsVoid() == PR_TRUE && \ resultC->errorOccurred == PR_FALSE) \ { \ PROCESS_PENDING_EVENTS_REF (reference); \ @@ -655,7 +655,7 @@ char const* TYPES[10] = { "Object", PLUGIN_DEBUG_0ARG("RECEIVE STRING UCS 1\n"); \ ResultContainer *resultC; \ factory->result_map.Get(reference, &resultC); \ - while (resultC->returnValueUCS.IsEmpty() && \ + while (resultC->returnValueUCS.IsVoid() == PR_TRUE && \ resultC->errorOccurred == PR_FALSE) \ { \ PROCESS_PENDING_EVENTS_REF (reference); \ @@ -855,6 +855,8 @@ ResultContainer::ResultContainer () returnIdentifier = -1; returnValue.Truncate(); returnValueUCS.Truncate(); + returnValue.SetIsVoid(PR_TRUE); + returnValueUCS.SetIsVoid(PR_TRUE); errorMessage.Truncate(); errorOccurred = PR_FALSE; @@ -877,6 +879,8 @@ ResultContainer::Clear() returnIdentifier = -1; returnValue.Truncate(); returnValueUCS.Truncate(); + returnValue.SetIsVoid(PR_TRUE); + returnValueUCS.SetIsVoid(PR_TRUE); errorMessage.Truncate(); errorOccurred = PR_FALSE; @@ -1007,6 +1011,7 @@ private: nsresult StartAppletviewer (); void ProcessMessage(); void ConsumeMsgFromJVM(); + nsresult GetProxyInfo(const char* siteAddr, char** proxyScheme, char** proxyHost, char** proxyPort); nsCOMPtr sink; nsCOMPtr transport; nsCOMPtr applet_viewer_process; @@ -1792,7 +1797,7 @@ NS_IMETHODIMP NS_IMETHODIMP IcedTeaPluginFactory::Show (void) { - nsCString msg("showconsole"); + nsCString msg("plugin showconsole"); this->SendMessageToAppletViewer(msg); return NS_OK; } @@ -1800,7 +1805,7 @@ NS_IMETHODIMP NS_IMETHODIMP IcedTeaPluginFactory::Hide (void) { - nsCString msg("hideconsole"); + nsCString msg("plugin hideconsole"); this->SendMessageToAppletViewer(msg); return NS_OK; } @@ -2658,6 +2663,96 @@ IcedTeaPluginInstance::GetJavaObject (jo return factory->GetJavaObject (instance_identifier, object); } +#include +#include +#include +#include +#include +#include +#include + +/** + * + * Returns the proxy information for the given url + * + * The proxy query part of this function can be made much smaller by using + * nsIPluginManager2::FindProxyForURL() .. however, because we need to parse + * the return components in various ways, it is easier to query + * nsIProtocolProxyService directly + * + * @param siteAddr The URL to check + * @param proxyScheme Return parameter containing the proxy URI scheme (http/socks/etc.) + * @param proxyHost Return parameter containing the proxy host + * @param proxyPort Return parameter containing the proxy port + */ + +NS_IMETHODIMP +IcedTeaPluginFactory::GetProxyInfo(const char* siteAddr, char** proxyScheme, char** proxyHost, char** proxyPort) +{ + nsresult rv; + + // Initialize service variables + nsCOMPtr proxy_svc = do_GetService(NS_PROTOCOLPROXYSERVICE_CONTRACTID, &rv); + + if (!proxy_svc) { + printf("Cannot initialize proxy service\n"); + return rv; + } + + nsCOMPtr io_svc = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); + + if (NS_FAILED(rv) || !io_svc) { + printf("Cannot initialize io service\n"); + return NS_ERROR_FAILURE; + } + + // uri which needs to be accessed + nsCOMPtr uri; + io_svc->NewURI(nsCString(siteAddr), NULL, NULL, getter_AddRefs(uri)); + + // find the proxy address if any + nsCOMPtr info; + proxy_svc->Resolve(uri, 0, getter_AddRefs(info)); + + // if there is no proxy found, return immediately + if (!info) { + PLUGIN_DEBUG_1ARG("%s does not need a proxy\n", siteAddr); + return NS_ERROR_FAILURE; + } + + // if proxy info is available, extract it + nsCString phost; + PRInt32 pport; + nsCString ptype; + + info->GetHost(phost); + info->GetPort(&pport); + info->GetType(ptype); + + // resolve the proxy address to an IP + nsCOMPtr dns_svc = do_GetService(NS_DNSSERVICE_CONTRACTID, &rv); + + if (!dns_svc) { + printf("Cannot initialize DNS service\n"); + return rv; + } + + nsCOMPtr record; + dns_svc->Resolve(phost, 0U, getter_AddRefs(record)); + + // TODO: Add support for multiple ips + nsDependentCString ipAddr; + record->GetNextAddrAsString(ipAddr); + + // pack information in return variables + snprintf(*proxyScheme, sizeof(char)*32, "%s", ptype.get()); + snprintf(*proxyHost, sizeof(char)*64, "%s", ipAddr.get()); + snprintf(*proxyPort, sizeof(char)*8, "%d", pport); + + PLUGIN_DEBUG_4ARG("Proxy info for %s: %s %s %s\n", siteAddr, *proxyScheme, *proxyHost, *proxyPort); + + return NS_OK; +} NS_IMETHODIMP IcedTeaPluginInstance::GetCookie(const char* siteAddr, char** cookieString) @@ -2677,8 +2772,8 @@ IcedTeaPluginInstance::GetCookie(const c return NS_ERROR_FAILURE; } - nsIURI *uri; - io_svc->NewURI(nsCString(siteAddr), NULL, NULL, &uri); + nsCOMPtr uri; + io_svc->NewURI(nsCString(siteAddr), NULL, NULL, getter_AddRefs(uri)); nsCOMPtr cookie_svc = do_GetService(NS_COOKIESERVICE_CONTRACTID, &rv); @@ -2902,6 +2997,13 @@ IcedTeaPluginFactory::HandleMessage (nsC nsDependentCSubstring prefix(pch, strlen(pch)); pch = strtok (NULL, " "); PRUint32 identifier = nsDependentCSubstring(pch, strlen(pch)).ToInteger (&conversionResult); + + /* Certain prefixes may not have an identifier. if they don't. we have a command here */ + nsDependentCSubstring command; + if (NS_FAILED(conversionResult)) { + command.Rebind(pch, strlen(pch)); + } + PRUint32 reference = -1; if (strstr(message.get(), "reference") != NULL) { @@ -2910,8 +3012,11 @@ IcedTeaPluginFactory::HandleMessage (nsC reference = nsDependentCSubstring(pch, strlen(pch)).ToInteger (&conversionResult); } - pch = strtok (NULL, " "); - nsDependentCSubstring command(pch, strlen(pch)); + if (command.Length() == 0) { + pch = strtok (NULL, " "); + command.Rebind(pch, strlen(pch)); + } + pch = strtok (NULL, " "); nsDependentCSubstring rest("", 0); @@ -3251,7 +3356,8 @@ IcedTeaPluginFactory::HandleMessage (nsC ResultContainer *resultC; result_map.Get(reference, &resultC); - resultC->returnValue = rest; + resultC->returnValue = rest; + resultC->returnValue.SetIsVoid(PR_FALSE); PLUGIN_DEBUG_1ARG ("PLUGIN GOT RETURN VALUE: %s\n", resultC->returnValue.get()); } else if (command == "GetStringUTFChars") @@ -3339,11 +3445,55 @@ IcedTeaPluginFactory::HandleMessage (nsC ResultContainer *resultC; result_map.Get(reference, &resultC); resultC->returnValueUCS = returnValueUCS; + resultC->returnValueUCS.SetIsVoid(PR_FALSE); } // Do nothing for: SetStaticField, SetField, ExceptionClear, // DeleteGlobalRef, DeleteLocalRef } + else if (prefix == "plugin") + { + + if (command == "PluginProxyInfo") { + + nsresult rv; + nsCOMPtr net_util = do_GetService(NS_NETUTIL_CONTRACTID, &rv); + + if (!net_util) + printf("Error instantiating NetUtil service.\n"); + + // decode the url + nsDependentCSubstring url; + net_util->UnescapeString(rest, 0, url); + + char* proxyScheme = (char*) malloc(sizeof(char)*32); + char* proxyHost = (char*) malloc(sizeof(char)*64); + char* proxyPort = (char*) malloc(sizeof(char)*8); + + nsCString proxyInfo("plugin PluginProxyInfo "); + + // get proxy info + if (GetProxyInfo(((nsCString) url).get(), &proxyScheme, &proxyHost, &proxyPort) == NS_OK) + { + proxyInfo += proxyScheme; + proxyInfo += " "; + proxyInfo += proxyHost; + proxyInfo += " "; + proxyInfo += proxyPort; + + PLUGIN_DEBUG_4ARG("Proxy for %s is %s %s %s\n", ((nsCString) url).get(), proxyScheme, proxyHost, proxyPort); + } else { + PLUGIN_DEBUG_1ARG("No suitable proxy found for %s\n", ((nsCString) url).get()); + } + + // send back what we found + SendMessageToAppletViewer (proxyInfo); + + // free allocated memory + delete proxyScheme, proxyHost, proxyPort; + + } + } } void IcedTeaPluginFactory::ProcessMessage () diff -r bbac5c54022b -r 8dc304404e01 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java --- a/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java Wed May 20 20:50:48 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java Wed May 20 21:17:02 2009 +0100 @@ -106,7 +106,7 @@ public class JNLPFile { // null values will still work, and app can set defaults later } } - + /** * Empty stub, allowing child classes to override the constructor */ diff -r bbac5c54022b -r 8dc304404e01 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java --- a/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java Wed May 20 20:50:48 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java Wed May 20 21:17:02 2009 +0100 @@ -331,6 +331,22 @@ public class Launcher { throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotApplication"), R("LNotApplicationInfo"))); try { + final int preferredWidth = 500; + final int preferredHeight = 400; + JNLPSplashScreen splashScreen = null; + URL splashImageURL = file.getInformation().getIconLocation( + IconDesc.SPLASH, preferredWidth, preferredHeight); + if (splashImageURL != null) { + ResourceTracker resourceTracker = new ResourceTracker(true); + resourceTracker.addResource(splashImageURL, "SPLASH", file.getFileVersion(), updatePolicy); + splashScreen = new JNLPSplashScreen(resourceTracker, null, null); + splashScreen.setSplashImageURL(splashImageURL); + if (splashScreen.isSplashScreenValid()) { + splashScreen.setVisible(true); + } + } + + ApplicationInstance app = createApplication(file); app.initialize(); @@ -360,6 +376,13 @@ public class Launcher { // required to make some apps work right Thread.currentThread().setContextClassLoader(app.getClassLoader()); + + if (splashScreen != null) { + if (splashScreen.isSplashScreenValid()) { + splashScreen.setVisible(false); + } + splashScreen.dispose(); + } main.invoke(null, new Object[] { args } ); diff -r bbac5c54022b -r 8dc304404e01 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java --- a/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java Wed May 20 20:50:48 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java Wed May 20 21:17:02 2009 +0100 @@ -42,6 +42,7 @@ public class NetxPanel extends AppletVie private boolean exitOnFailure = true; private AppletInstance appInst = null; private String cookieStr; + private boolean appletAlive; public NetxPanel(URL documentURL, Hashtable atts) { @@ -54,6 +55,7 @@ public class NetxPanel extends AppletVie this(documentURL, atts); this.exitOnFailure = exitOnFailure; this.cookieStr = cookieStr; + this.appletAlive = true; } //Overriding to use Netx classloader. You might need to relax visibility @@ -76,7 +78,7 @@ public class NetxPanel extends AppletVie if (JNLPRuntime.isDebug()) System.out.println("initializing JNLPRuntime..."); - JNLPRuntime.initialize(); + JNLPRuntime.initialize(false); } else { if (JNLPRuntime.isDebug()) System.out.println("JNLPRuntime already initialized"); @@ -121,10 +123,11 @@ public class NetxPanel extends AppletVie validate(); } } catch (Exception e) { + this.appletAlive = false; e.printStackTrace(); } } - + // Reminder: Relax visibility in sun.applet.AppletPanel protected synchronized void createAppletThread() { handler = new Thread(this); @@ -139,5 +142,9 @@ public class NetxPanel extends AppletVie public ClassLoader getAppletClassLoader() { return appInst.getClassLoader(); } + + public boolean isAlive() { + return handler.isAlive() && this.appletAlive; From ahughes at redhat.com Wed May 20 13:31:09 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 20 May 2009 20:31:09 +0000 Subject: changeset in /hg/icedtea: Merge shiny new plugin. Message-ID: changeset 933d372e9ded in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=933d372e9ded description: Merge shiny new plugin. 2009-05-15 Deepak Bhole * Makefile.am: Wire in new plugin build. * configure.ac: Wire in new plugin (switch --enable-npplugin). * IcedTeaNPPlugin.cc: New file - based on GCJ Web Plugin. * plugin/icedteanp/netscape/javascript/JSException.java: New file, copied from the IcedTea plugin Java backend. * plugin/icedteanp/netscape/javascript/JSObject.java: Same. * plugin/icedteanp/netscape/javascript/JSProxy.java: Same. * plugin/icedteanp/netscape/javascript/JSRunnable.java: Same. * plugin/icedteanp/netscape/javascript/JSUtil.java: Same. * plugin/icedteanp/sun/applet/AppletSecurityContextManager.java: Same. * plugin/icedteanp/sun/applet/GetMemberPluginCallRequest.java: Same. * plugin/icedteanp/sun/applet/GetWindowPluginCallRequest.java: Same. * plugin/icedteanp/sun/applet/JavaConsole.java: Same. * plugin/icedteanp/sun/applet/PasswordAuthenticationDialog.java: Same. * plugin/icedteanp/sun/applet/PluginAppletSecurityContext.java: Same. * plugin/icedteanp/sun/applet/PluginAppletViewer.java: Same. * plugin/icedteanp/sun/applet/PluginCallRequest.java: Same. * plugin/icedteanp/sun/applet/PluginCallRequestFactory.java: Same. * plugin/icedteanp/sun/applet/PluginClassLoader.java: Same. * plugin/icedteanp/sun/applet/PluginDebug.java: Same. * plugin/icedteanp/sun/applet/PluginException.java: Same. * plugin/icedteanp/sun/applet/PluginMain.java: Same. * plugin/icedteanp/sun/applet/PluginMessageConsumer.java: Same. * plugin/icedteanp/sun/applet/PluginMessageHandlerWorker.java: Same. * plugin/icedteanp/sun/applet/PluginObjectStore.java: Same. * plugin/icedteanp/sun/applet/PluginProxyInfoRequest.java: Same. * plugin/icedteanp/sun/applet/PluginProxySelector.java: Same. * plugin/icedteanp/sun/applet/PluginStreamHandler.java: Same. * plugin/icedteanp/sun/applet/RequestQueue.java: Same. * plugin/icedteanp/sun/applet/TestEnv.java: Same. * plugin/icedteanp/sun/applet/VoidPluginCallRequest.java: Same. diffstat: 31 files changed, 8789 insertions(+), 3 deletions(-) ChangeLog | 34 IcedTeaNPPlugin.cc | 2006 ++++++++++ Makefile.am | 68 configure.ac | 23 plugin/icedteanp/netscape/javascript/JSException.java | 140 plugin/icedteanp/netscape/javascript/JSObject.java | 263 + plugin/icedteanp/netscape/javascript/JSProxy.java | 58 plugin/icedteanp/netscape/javascript/JSRunnable.java | 72 plugin/icedteanp/netscape/javascript/JSUtil.java | 59 plugin/icedteanp/sun/applet/AppletSecurityContextManager.java | 71 plugin/icedteanp/sun/applet/GetMemberPluginCallRequest.java | 76 plugin/icedteanp/sun/applet/GetWindowPluginCallRequest.java | 75 plugin/icedteanp/sun/applet/JavaConsole.java | 365 + plugin/icedteanp/sun/applet/PasswordAuthenticationDialog.java | 241 + plugin/icedteanp/sun/applet/PluginAppletSecurityContext.java | 1307 ++++++ plugin/icedteanp/sun/applet/PluginAppletViewer.java | 1872 +++++++++ plugin/icedteanp/sun/applet/PluginCallRequest.java | 85 plugin/icedteanp/sun/applet/PluginCallRequestFactory.java | 60 plugin/icedteanp/sun/applet/PluginClassLoader.java | 51 plugin/icedteanp/sun/applet/PluginDebug.java | 51 plugin/icedteanp/sun/applet/PluginException.java | 53 plugin/icedteanp/sun/applet/PluginMain.java | 315 + plugin/icedteanp/sun/applet/PluginMessageConsumer.java | 119 plugin/icedteanp/sun/applet/PluginMessageHandlerWorker.java | 121 plugin/icedteanp/sun/applet/PluginObjectStore.java | 132 plugin/icedteanp/sun/applet/PluginProxyInfoRequest.java | 85 plugin/icedteanp/sun/applet/PluginProxySelector.java | 195 plugin/icedteanp/sun/applet/PluginStreamHandler.java | 479 ++ plugin/icedteanp/sun/applet/RequestQueue.java | 77 plugin/icedteanp/sun/applet/TestEnv.java | 172 plugin/icedteanp/sun/applet/VoidPluginCallRequest.java | 67 diffs (truncated from 9008 to 500 lines): diff -r 8dc304404e01 -r 933d372e9ded ChangeLog --- a/ChangeLog Wed May 20 21:17:02 2009 +0100 +++ b/ChangeLog Wed May 20 21:30:24 2009 +0100 @@ -1,3 +1,37 @@ 2009-05-13 Omair Majid + + * Makefile.am: Wire in new plugin build. + * configure.ac: Wire in new plugin (switch --enable-npplugin). + * IcedTeaNPPlugin.cc: New file - based on GCJ Web Plugin. + * plugin/icedteanp/netscape/javascript/JSException.java: New file, copied + from the IcedTea plugin Java backend. + * plugin/icedteanp/netscape/javascript/JSObject.java: Same. + * plugin/icedteanp/netscape/javascript/JSProxy.java: Same. + * plugin/icedteanp/netscape/javascript/JSRunnable.java: Same. + * plugin/icedteanp/netscape/javascript/JSUtil.java: Same. + * plugin/icedteanp/sun/applet/AppletSecurityContextManager.java: Same. + * plugin/icedteanp/sun/applet/GetMemberPluginCallRequest.java: Same. + * plugin/icedteanp/sun/applet/GetWindowPluginCallRequest.java: Same. + * plugin/icedteanp/sun/applet/JavaConsole.java: Same. + * plugin/icedteanp/sun/applet/PasswordAuthenticationDialog.java: Same. + * plugin/icedteanp/sun/applet/PluginAppletSecurityContext.java: Same. + * plugin/icedteanp/sun/applet/PluginAppletViewer.java: Same. + * plugin/icedteanp/sun/applet/PluginCallRequest.java: Same. + * plugin/icedteanp/sun/applet/PluginCallRequestFactory.java: Same. + * plugin/icedteanp/sun/applet/PluginClassLoader.java: Same. + * plugin/icedteanp/sun/applet/PluginDebug.java: Same. + * plugin/icedteanp/sun/applet/PluginException.java: Same. + * plugin/icedteanp/sun/applet/PluginMain.java: Same. + * plugin/icedteanp/sun/applet/PluginMessageConsumer.java: Same. + * plugin/icedteanp/sun/applet/PluginMessageHandlerWorker.java: Same. + * plugin/icedteanp/sun/applet/PluginObjectStore.java: Same. + * plugin/icedteanp/sun/applet/PluginProxyInfoRequest.java: Same. + * plugin/icedteanp/sun/applet/PluginProxySelector.java: Same. + * plugin/icedteanp/sun/applet/PluginStreamHandler.java: Same. + * plugin/icedteanp/sun/applet/RequestQueue.java: Same. + * plugin/icedteanp/sun/applet/TestEnv.java: Same. + * plugin/icedteanp/sun/applet/VoidPluginCallRequest.java: Same. + 2009-05-13 Omair Majid * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. This new class diff -r 8dc304404e01 -r 933d372e9ded IcedTeaNPPlugin.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/IcedTeaNPPlugin.cc Wed May 20 21:30:24 2009 +0100 @@ -0,0 +1,2006 @@ +/* gcjwebplugin.cc -- web browser plugin to execute Java applets + Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +// System includes. +#include +#include +#include +#include +#include +#include +#include +#include + +// Netscape plugin API includes. +#include +#include + +// GLib includes. +#include +#include + +// GTK includes. +#include + +// Documentbase retrieval includes. +#include +#include +#include + +// API's into Mozilla +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +// Debugging macros. +#define PLUGIN_DEBUG(message) \ + g_print ("GCJ PLUGIN: thread %p: %s\n", g_thread_self (), message) + +#define PLUGIN_DEBUG_TWO(first, second) \ + g_print ("GCJ PLUGIN: thread %p: %s %s\n", g_thread_self (), \ + first, second) + +// Error reporting macros. +#define PLUGIN_ERROR(message) \ + g_printerr ("%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__, \ + g_thread_self (), message) + +#define PLUGIN_ERROR_TWO(first, second) \ + g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__, \ + g_thread_self (), first, second) + +#define PLUGIN_ERROR_THREE(first, second, third) \ + g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__, \ + __LINE__, g_thread_self (), first, second, third) + +// Plugin information passed to about:plugins. +#define PLUGIN_NAME "IcedTea NPR Web Browser Plugin (using IcedTea)" +#define PLUGIN_DESC "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets." +#define PLUGIN_MIME_DESC \ + "application/x-java-vm:class,jar:IcedTea;" \ + "application/x-java-applet:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.1.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.1.2:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.1.3:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.2:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.2.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.2.2:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.3:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.3.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.4:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.4.1:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.5:class,jar:IcedTea;" \ + "application/x-java-applet;version=1.6:class,jar:IcedTea;" \ + "application/x-java-applet;jpi-version=1.6.0_00:class,jar:IcedTea;" \ + "application/x-java-bean:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.1.2:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.1.3:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.2:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.2.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.2.2:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.3:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.3.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.4:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.4.1:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.5:class,jar:IcedTea;" \ + "application/x-java-bean;version=1.6:class,jar:IcedTea;" \ + "application/x-java-bean;jpi-version=1.6.0_00:class,jar:IcedTea;" +#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE +#define PLUGIN_MIME_TYPE "application/x-java-vm" +#define PLUGIN_FILE_EXTS "class,jar,zip" +#define PLUGIN_MIME_COUNT 1 + +#define FAILURE_MESSAGE "gcjwebplugin error: Failed to run %s." \ + " For more detail rerun \"firefox -g\" in a terminal window." + +static int plugin_debug = 1; + +#define PLUGIN_DEBUG_0ARG(str) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str); \ + } \ + } while (0) + +#define PLUGIN_DEBUG_1ARG(str, arg1) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str, arg1); \ + } \ + } while (0) + +#define PLUGIN_DEBUG_2ARG(str, arg1, arg2) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str, arg1, arg2); \ + } \ + } while (0) + +#define PLUGIN_DEBUG_3ARG(str, arg1, arg2, arg3) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str, arg1, arg2, arg3); \ + } \ + } while (0) + +#define PLUGIN_DEBUG_4ARG(str, arg1, arg2, arg3, arg4) \ + do \ + { \ + if (plugin_debug) \ + { \ + fprintf(stderr, "GCJ PLUGIN: thread %p: ", g_thread_self ()); \ + fprintf(stderr, str, arg1, arg2, arg3, arg4); \ + } \ + } while (0) + +// Documentbase retrieval required definition. +static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID); + +// Browser function table. +static NPNetscapeFuncs browserFunctions; + +// Data directory for plugin. +static gchar* data_directory = NULL; + +// Fully-qualified appletviewer executable. +static gchar* appletviewer_executable = NULL; + +// Applet viewer input channel (needs to be static because it is used in plugin_in_pipe_callback) +static GIOChannel* in_from_appletviewer = NULL; + +// Applet viewer input pipe name. +gchar* in_pipe_name; + +// Applet viewer input watch source. +gint in_watch_source; + +// Applet viewer output pipe name. +gchar* out_pipe_name; + +// Applet viewer output watch source. +gint out_watch_source; + +// Applet viewer output channel. +GIOChannel* out_to_appletviewer; + +// Tracks jvm status +gboolean jvm_up = FALSE; + +// Keeps track of initialization. NP_Initialize should only be +// called once. +gboolean initialized = false; + +GQuark ITNP_PLUGIN_ERROR = g_quark_from_string("IcedTeaNPPlugin"); + +// GCJPluginData stores all the data associated with a single plugin +// instance. A separate plugin instance is created for each +// tag. For now, each plugin instance spawns its own applet viewer +// process but this may need to change if we find pages containing +// multiple applets that expect to be running in the same VM. +struct GCJPluginData +{ + // A unique identifier for this plugin window. + gchar* instance_string; + // Mutex to protect appletviewer_alive. + GMutex* appletviewer_mutex; + // Back-pointer to the plugin instance to which this data belongs. + // This should not be freed but instead simply set to NULL. + NPP owner; + // The address of the plugin window. This should not be freed but + // instead simply set to NULL. + gpointer window_handle; + // The last plugin window width sent to us by the browser. + guint32 window_width; + // The last plugin window height sent to us by the browser. + guint32 window_height; +}; + +// Documentbase retrieval type-punning union. +typedef union +{ + void** void_field; + nsIPluginTagInfo2** info_field; +} info_union; + +// Static instance helper functions. +// Have the browser allocate a new GCJPluginData structure. +static void plugin_data_new (GCJPluginData** data); +// Retrieve the current document's documentbase. +static gchar* plugin_get_documentbase (NPP instance); +// Notify the user that the appletviewer is not installed correctly. +static void plugin_display_failure_dialog (); +// Callback used to monitor input pipe status. +static gboolean plugin_in_pipe_callback (GIOChannel* source, + GIOCondition condition, + gpointer plugin_data); +// Callback used to monitor output pipe status. +static gboolean plugin_out_pipe_callback (GIOChannel* source, + GIOCondition condition, + gpointer plugin_data); +static NPError plugin_start_appletviewer (GCJPluginData* data); +static gchar* plugin_create_applet_tag (int16 argc, char* argn[], + char* argv[]); +static void plugin_send_message_to_appletviewer (gchar const* message); +static void plugin_stop_appletviewer (); +// Uninitialize GCJPluginData structure +static void plugin_data_destroy (NPP instance); + +NS_IMETHODIMP get_cookie_info(const char* siteAddr, char** cookieString); +void get_proxy_info(const char* siteAddr, char** proxy_scheme, char** proxy_host, char** proxy_port, GError *error); +void decode_url(const gchar* url, gchar** decoded_url); +void consume_message(gchar* message); +void start_jvm_if_needed(); +static void appletviewer_monitor(GPid pid, gint status, gpointer data); + +// Global instance counter. +// Mutex to protect plugin_instance_counter. +static GMutex* plugin_instance_mutex = NULL; +// A global variable for reporting GLib errors. This must be free'd +// and set to NULL after each use. +static GError* channel_error = NULL; + +static GHashTable* instance_to_id_map = g_hash_table_new(NULL, NULL); +static GHashTable* id_to_instance_map = g_hash_table_new(NULL, NULL); +static gint instance_counter = 1; +static GPid appletviewer_pid = -1; +static guint appletviewer_watch_id = -1; + +// Functions prefixed by GCJ_ are instance functions. They are called +// by the browser and operate on instances of GCJPluginData. +// Functions prefixed by plugin_ are static helper functions. +// Functions prefixed by NP_ are factory functions. They are called +// by the browser and provide functionality needed to create plugin +// instances. + +// INSTANCE FUNCTIONS + +// Creates a new gcjwebplugin instance. This function creates a +// GCJPluginData* and stores it in instance->pdata. The following +// GCJPluginData fiels are initialized: instance_string, in_pipe_name, +// in_from_appletviewer, in_watch_source, out_pipe_name, +// out_to_appletviewer, out_watch_source, appletviewer_mutex, owner, +// appletviewer_alive. In addition two pipe files are created. All +// of those fields must be properly destroyed, and the pipes deleted, +// by GCJ_Destroy. If an error occurs during initialization then this +// function will free anything that's been allocated so far, set +// instance->pdata to NULL and return an error code. +NPError +GCJ_New (NPMIMEType pluginType, NPP instance, uint16 mode, + int16 argc, char* argn[], char* argv[], + NPSavedData* saved) +{ + PLUGIN_DEBUG ("GCJ_New"); + + NPError np_error = NPERR_NO_ERROR; + GCJPluginData* data = NULL; + + gchar* documentbase = NULL; + gchar* read_message = NULL; + gchar* applet_tag = NULL; + gchar* tag_message = NULL; + gchar* cookie_info = NULL; + + if (!instance) + { + PLUGIN_ERROR ("Browser-provided instance pointer is NULL."); + np_error = NPERR_INVALID_INSTANCE_ERROR; + goto cleanup_done; + } + + // data + plugin_data_new (&data); + if (data == NULL) + { + PLUGIN_ERROR ("Failed to allocate plugin data."); + np_error = NPERR_OUT_OF_MEMORY_ERROR; + goto cleanup_done; + } + + // start the jvm if needed + start_jvm_if_needed(); + + // Initialize data->instance_string. + // + // instance_string should be unique for this process so we use a + // combination of getpid and plugin_instance_counter. + // + // Critical region. Reference and increment plugin_instance_counter + // global. + g_mutex_lock (plugin_instance_mutex); + + // data->instance_string + data->instance_string = g_strdup_printf ("%d", + instance_counter); + + g_mutex_unlock (plugin_instance_mutex); + + // data->appletviewer_mutex + data->appletviewer_mutex = g_mutex_new (); + + g_mutex_lock (data->appletviewer_mutex); + + // Documentbase retrieval. + documentbase = plugin_get_documentbase (instance); + if (!documentbase) + { + PLUGIN_ERROR ("Documentbase retrieval failed." + " Browser not Mozilla-based?"); + goto cleanup_appletviewer_mutex; + } + + // Send applet tag message to appletviewer. + applet_tag = plugin_create_applet_tag (argc, argn, argv); + + tag_message = (gchar*) malloc(strlen(applet_tag)*sizeof(gchar) + 1024); + g_sprintf(tag_message, "instance %d tag %s %s", instance_counter, documentbase, applet_tag); + + //plugin_send_message_to_appletviewer (data, data->instance_string); + plugin_send_message_to_appletviewer (tag_message); + + //send cookie information + char* cookie_string; + if (get_cookie_info(documentbase, &cookie_string) == NS_OK) + { + cookie_info = (gchar*) malloc(sizeof(cookie_string) + 1024); + g_sprintf(cookie_info, "instance %d cookie %s", instance_counter, cookie_string); + } + else + { + cookie_info = (gchar*) malloc(1024); + g_sprintf(cookie_info, "instance %d cookie", instance_counter); + } + + plugin_send_message_to_appletviewer (cookie_info); + + g_mutex_unlock (data->appletviewer_mutex); + + // If initialization succeeded entirely then we store the plugin + // data in the instance structure and return. Otherwise we free the + // data we've allocated so far and set instance->pdata to NULL. + + // Set back-pointer to owner instance. + data->owner = instance; + instance->pdata = data; + goto cleanup_done; + + cleanup_appletviewer_mutex: + g_free (data->appletviewer_mutex); + data->appletviewer_mutex = NULL; + + // cleanup_instance_string: + g_free (data->instance_string); + data->instance_string = NULL; + + // cleanup_data: + // Eliminate back-pointer to plugin instance. + data->owner = NULL; + (*browserFunctions.memfree) (data); + data = NULL; + + // Initialization failed so return a NULL pointer for the browser + // data. + instance->pdata = NULL; + + cleanup_done: + g_free (tag_message); + tag_message = NULL; + g_free (applet_tag); + applet_tag = NULL; + g_free (read_message); + read_message = NULL; + g_free (documentbase); + documentbase = NULL; + From langel at redhat.com Wed May 20 13:31:12 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 20 May 2009 20:31:12 +0000 Subject: changeset in /hg/icedtea: 2009-05-20 Lillian Angel changeset 97367bcc3bc1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=97367bcc3bc1 description: 2009-05-20 Lillian Angel * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of certs outside of loop, so it is not reset during each iteration. diffstat: 2 files changed, 6 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java | 2 +- diffs (29 lines): diff -r 933d372e9ded -r 97367bcc3bc1 ChangeLog --- a/ChangeLog Wed May 20 21:30:24 2009 +0100 +++ b/ChangeLog Wed May 20 16:14:38 2009 -0400 @@ -1,3 +1,8 @@ 2009-05-15 Deepak Bhole + + * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of + certs outside of loop, so it is not reset during each iteration. + 2009-05-15 Deepak Bhole * Makefile.am: Wire in new plugin build. diff -r 933d372e9ded -r 97367bcc3bc1 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java --- a/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java Wed May 20 21:30:24 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java Wed May 20 16:14:38 2009 -0400 @@ -199,12 +199,12 @@ public class JarSigner implements CertVe public void verifyJars(List jars, ResourceTracker tracker) throws Exception { + certs = new ArrayList(); for (int i = 0; i < jars.size(); i++) { JARDesc jar = (JARDesc) jars.get(i); verifiedJars = new ArrayList(); unverifiedJars = new ArrayList(); - certs = new ArrayList(); try { From gnu_andrew at member.fsf.org Wed May 20 13:34:22 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 20 May 2009 21:34:22 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> Message-ID: <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> 2009/5/19 Andrew John Hughes : > 2009/5/8 Andrew John Hughes : >> Dear all, >> >> Sun plan to release a JavaOne preview of JDK7 on May 21st >> (http://openjdk.java.net/projects/jdk7/milestones/). >> We'd like to do a corresponding release of IcedTea7 (1.10) around the >> same time, that can then be packaged in any distros that wish to ship >> such a preview. >> This will involve: >> >> * Updating IcedTea7 to support the latest build drop from Sun >> (currently b57, which is the last non-stabilisation release). >> IcedTea7 is now based on the IcedTea forest >> (http://hg.openjdk.java.net/icedtea/jdk7) so this is a two stage >> process involving pulling the latest changes into the forest and then >> ensuring this builds with IcedTea7. >> * Updating Shark/Zero in IcedTea7; ideally we would put this directly >> into the forest, but I don't know how ready Gary is for this step. >> * Updating the plugin/jaxws support; again it would be nice to have it >> in the forest, but there probably isn't enough time. >> * Any additional features from IcedTea6; we're not doing mass merges >> any more because the two have diverged so far from each other that >> this has become impractical (probably lots of conflicts and build >> breakages for a few usable changes). ?doko and mjw have already >> requested that --with-additional-vms and systemtap support be added. >> >> Any help would be much appreciated. ?Integration of Shark/Zero and the >> plugin can be done fairly independently so if someone wants to work on >> this, feel free. >> -- >> 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 >> > > IcedTea7 should now fully bootstrap with the current tip of the > IcedTea forest, which is synced to b59, the latest OpenJDK7 build > drop. ?This is likely to be the last one (if there is a b60, any > changes will be minor). > > I'm now going to sync up Shark/Zero, the plugin and VisualVM, and add > mjw and doko's patches. ?Once that's complete, a 1.10 branch will be > created. ?However, please start testing the tree as it stands and let > me know of any issues as soon as possible. > > I aim to release IcedTea7 1.10 on Friday afternoon (UTC), barring any blockers. > -- > 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 > Current status: * Everything is now synced from IcedTea6 (except Gervill, which mjw wanted to look at). * Shark/Zero is broken :( * Please test your favourite shiny feature and report back. I'll add some hackery tomorrow so that we can use pre-generated files for Nimbus. Also looking into a build issue Lillian found. -- 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 ahughes at redhat.com Thu May 21 04:27:40 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 11:27:40 +0000 Subject: changeset in /hg/icedtea: Add missing file. Message-ID: changeset 9d0d19948b10 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9d0d19948b10 description: Add missing file. diffstat: 1 file changed, 93 insertions(+) overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java | 93 ++++++++++ diffs (97 lines): diff -r 97367bcc3bc1 -r 9d0d19948b10 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java Wed May 20 22:54:07 2009 +0100 @@ -0,0 +1,93 @@ +package net.sourceforge.jnlp; + +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Insets; +import java.awt.Toolkit; +import java.io.IOException; +import java.net.URL; + +import javax.imageio.ImageIO; +import javax.swing.JFrame; + +import net.sourceforge.jnlp.cache.ResourceTracker; +import net.sourceforge.jnlp.runtime.JNLPRuntime; + +public class JNLPSplashScreen extends JFrame { + + String applicationTitle; + String applicationVendor; + + ResourceTracker resourceTracker; + + URL splashImageUrl; + Image splashImage; + + public JNLPSplashScreen(ResourceTracker resourceTracker, + String applicationTitle, String applicationVendor) { + + // If the JNLP file does not contain any icon images, the splash image + // will consist of the application's title and vendor, as taken from the + // JNLP file. + + this.resourceTracker = resourceTracker; + this.applicationTitle = applicationTitle; + this.applicationVendor = applicationVendor; + + } + + public void setSplashImageURL(URL url) { + splashImageUrl = url; + splashImage = null; + try { + splashImage = ImageIO.read(resourceTracker + .getCacheFile(splashImageUrl)); + } catch (IOException e) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + splashImage = null; + return; + } catch (IllegalArgumentException argumentException) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + splashImage = null; + return; + } + + correctSize(); + } + + public boolean isSplashScreenValid() { + return (splashImage != null); + } + + private void correctSize() { + + Insets insets = getInsets(); + int minimumWidth = splashImage.getWidth(null) + insets.left + + insets.right; + int minimumHeight = splashImage.getHeight(null) + insets.top + + insets.bottom; + setMinimumSize(new Dimension(minimumWidth, minimumHeight)); + + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + setLocation((screenSize.width - minimumWidth) / 2, + (screenSize.height - minimumHeight) / 2); + } + + @Override + public void paint(Graphics g) { + if (splashImage == null) { + return; + } + + correctSize(); + Graphics2D g2 = (Graphics2D) g; + g2.drawImage(splashImage, getInsets().left, getInsets().top, null); + + } +} From ahughes at redhat.com Thu May 21 04:27:41 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 11:27:41 +0000 Subject: changeset in /hg/icedtea: Fix up Makefile issues found when buil... Message-ID: changeset 2afddd1c229e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2afddd1c229e description: Fix up Makefile issues found when building on Fedora 10. 2009-05-21 Andrew John Hughes * Makefile.am: Cleanup Makefile, make sure JNLP classes are included in rt-closed.jar and use this as the classpath when building extra-files. diffstat: 2 files changed, 17 insertions(+), 11 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 21 ++++++++++----------- diffs (78 lines): diff -r 9d0d19948b10 -r 2afddd1c229e ChangeLog --- a/ChangeLog Wed May 20 22:54:07 2009 +0100 +++ b/ChangeLog Thu May 21 00:16:15 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-20 Lillian Angel + + * Makefile.am: + Cleanup Makefile, make sure JNLP classes + are included in rt-closed.jar and use this + as the classpath when building extra-files. + 2009-05-20 Lillian Angel * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of diff -r 9d0d19948b10 -r 2afddd1c229e Makefile.am --- a/Makefile.am Wed May 20 22:54:07 2009 +0100 +++ b/Makefile.am Thu May 21 00:16:15 2009 +0100 @@ -1955,7 +1955,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-test-atomic-operations.patch \ patches/icedtea-zero.patch \ patches/icedtea-ia64-bugfix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch + patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \ patches/security/icedtea-6592792.patch \ patches/security/icedtea-6733959.patch \ patches/security/icedtea-6755943.patch \ @@ -2982,10 +2982,12 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAR) cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \ + -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \ + -C lib/rt net ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \ + -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \ + -C lib/rt net ; \ fi if test -d bootstrap/ecj/jre/lib ; \ then \ @@ -2997,22 +2999,21 @@ extra-source-files.txt: extra-source-files.txt: find $(abs_top_srcdir)/extra -name '*.java' | sort > $@ -stamps/extra-class-files.stamp: extra-source-files.txt \ - bootstrap/jdk1.7.0/jre/lib/rt-closed.jar +stamps/extra-class-files.stamp: extra-source-files.txt stamps/plugs.stamp mkdir -p extra-lib if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \ -source 1.5 \ - -sourcepath \ - $(abs_top_srcdir)/extra:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \ + -sourcepath $(abs_top_srcdir)/extra \ + -classpath $(ICEDTEA_RT) \ -bootclasspath \'\' \ @extra-source-files.txt ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \ -source 1.5 \ - -sourcepath \ - $(abs_top_srcdir)/extra:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \ + -sourcepath $(abs_top_srcdir)/extra \ + -classpath $(ICEDTEA_RT) \ -bootclasspath \'\' \ @extra-source-files.txt ; \ fi @@ -3565,8 +3566,6 @@ hotspot-ports: stamps/ports.stamp tools-class-files: stamps/tools-class-files.stamp -hotspot-ports: stamps/ports.stamp - hotspot-ports-ecj: stamps/ports-ecj.stamp clean: distclean-local From gbenson at redhat.com Thu May 21 06:25:45 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 21 May 2009 13:25:45 +0000 Subject: changeset in /hg/icedtea6: 2009-05-21 Gary Benson changeset 12f2a25cb831 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=12f2a25cb831 description: 2009-05-21 Gary Benson * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Fix for x86 debug builds. diffstat: 2 files changed, 7 insertions(+) ChangeLog | 5 +++++ ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2 ++ diffs (24 lines): diff -r 456c81041a91 -r 12f2a25cb831 ChangeLog --- a/ChangeLog Wed May 20 16:14:38 2009 -0400 +++ b/ChangeLog Thu May 21 14:26:47 2009 +0100 @@ -1,3 +1,8 @@ 2009-05-20 Lillian Angel + + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: + Fix for x86 debug builds. + 2009-05-20 Lillian Angel * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of diff -r 456c81041a91 -r 12f2a25cb831 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Wed May 20 16:14:38 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu May 21 14:26:47 2009 +0100 @@ -25,6 +25,8 @@ #include "incls/_precompiled.incl" #include "incls/_sharkCompiler.cpp.incl" + +#include using namespace llvm; From aph at redhat.com Thu May 21 06:41:16 2009 From: aph at redhat.com (Andrew Haley) Date: Thu, 21 May 2009 14:41:16 +0100 Subject: [Bug 100050] lcms 1.18 update breaks ICC_ProfileRGB Tests In-Reply-To: <20090520171027.C9BDC497D6@bugs.openjdk.java.net> References: <20090520171027.C9BDC497D6@bugs.openjdk.java.net> Message-ID: <4A1559FC.50300@redhat.com> bugzilla-daemon at bugs.openjdk.java.net wrote: > https://bugs.openjdk.java.net/show_bug.cgi?id=100050 > > --- Comment #9 from jennifer.godinez at sun.com 2009-05-20 10:10:27 PDT --- > Hi Andrew, > > The fix has been approved. If you want to push the fix yourself, here's the > suggested commit comment: > ----------------------------------------------------- > > 6839133: lcms 1.18 update breaks ICC_ProfileRGB Tests > Reviewed-by: avu, prr > Contributed-by: aph > > ----------------------------------------------------- > > After pushing, you can mark this as "FIXAVAILABLE". OK, thanks. Andrew. From langel at redhat.com Thu May 21 06:42:48 2009 From: langel at redhat.com (Lillian Angel) Date: Thu, 21 May 2009 09:42:48 -0400 Subject: changeset in /hg/icedtea6: 2009-05-21 Gary Benson References: Message-ID: <4A155A58.7000206@redhat.com> Hi, Do you want to apply this to the icedtea6-1.5 branch? Gary Benson wrote: > changeset 12f2a25cb831 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=12f2a25cb831 > description: > 2009-05-21 Gary Benson > > * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: > Fix for x86 debug builds. > > diffstat: > > 2 files changed, 7 insertions(+) > ChangeLog | 5 +++++ > ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2 ++ > > diffs (24 lines): > > diff -r 456c81041a91 -r 12f2a25cb831 ChangeLog > --- a/ChangeLog Wed May 20 16:14:38 2009 -0400 > +++ b/ChangeLog Thu May 21 14:26:47 2009 +0100 > @@ -1,3 +1,8 @@ 2009-05-20 Lillian Angel +2009-05-21 Gary Benson > + > + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: > + Fix for x86 debug builds. > + > 2009-05-20 Lillian Angel > > * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of > diff -r 456c81041a91 -r 12f2a25cb831 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp > --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Wed May 20 16:14:38 2009 -0400 > +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu May 21 14:26:47 2009 +0100 > @@ -25,6 +25,8 @@ > > #include "incls/_precompiled.incl" > #include "incls/_sharkCompiler.cpp.incl" > + > +#include > > using namespace llvm; > > From gbenson at redhat.com Thu May 21 06:52:17 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 21 May 2009 14:52:17 +0100 Subject: changeset in /hg/icedtea6: 2009-05-21 Gary Benson References: <4A155A58.7000206@redhat.com> Message-ID: <20090521135216.GC3170@redhat.com> Up to you. It only matters for non-PRODUCT builds on x86, and nobody's noticed it til now, so... Cheers, Gary Lillian Angel wrote: > Do you want to apply this to the icedtea6-1.5 branch? > > Gary Benson wrote: > > changeset 12f2a25cb831 in /hg/icedtea6 > > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=12f2a25cb831 > > description: > > 2009-05-21 Gary Benson > > > > * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: > > Fix for x86 debug builds. > > > > diffstat: > > > > 2 files changed, 7 insertions(+) > > ChangeLog | 5 +++++ > > ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2 ++ > > > > diffs (24 lines): > > > > diff -r 456c81041a91 -r 12f2a25cb831 ChangeLog > > --- a/ChangeLog Wed May 20 16:14:38 2009 -0400 > > +++ b/ChangeLog Thu May 21 14:26:47 2009 +0100 > > @@ -1,3 +1,8 @@ 2009-05-20 Lillian Angel > +2009-05-21 Gary Benson > > + > > + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: > > + Fix for x86 debug builds. > > + > > 2009-05-20 Lillian Angel > > * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of > > diff -r 456c81041a91 -r 12f2a25cb831 > > ports/hotspot/src/share/vm/shark/sharkCompiler.cpp > > --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Wed May 20 16:14:38 2009 -0400 > > +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu May 21 14:26:47 2009 +0100 > > @@ -25,6 +25,8 @@ > > #include "incls/_precompiled.incl" > > #include "incls/_sharkCompiler.cpp.incl" > > + > > +#include > > using namespace llvm; -- http://gbenson.net/ From langel at redhat.com Thu May 21 07:04:33 2009 From: langel at redhat.com (Lillian Angel) Date: Thu, 21 May 2009 10:04:33 -0400 Subject: changeset in /hg/icedtea6: 2009-05-21 Gary Benson References: <4A155A58.7000206@redhat.com> <20090521135216.GC3170@redhat.com> Message-ID: <4A155F71.9000103@redhat.com> Might as well. it's under ssh://icedtea.classpath.org/hg/release/icedtea6-1.5 Gary Benson wrote: > Up to you. It only matters for non-PRODUCT builds on x86, > and nobody's noticed it til now, so... > > Cheers, > Gary > > Lillian Angel wrote: > >> Do you want to apply this to the icedtea6-1.5 branch? >> >> Gary Benson wrote: >> >>> changeset 12f2a25cb831 in /hg/icedtea6 >>> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=12f2a25cb831 >>> description: >>> 2009-05-21 Gary Benson >>> >>> * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: >>> Fix for x86 debug builds. >>> >>> diffstat: >>> >>> 2 files changed, 7 insertions(+) >>> ChangeLog | 5 +++++ >>> ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2 ++ >>> >>> diffs (24 lines): >>> >>> diff -r 456c81041a91 -r 12f2a25cb831 ChangeLog >>> --- a/ChangeLog Wed May 20 16:14:38 2009 -0400 >>> +++ b/ChangeLog Thu May 21 14:26:47 2009 +0100 >>> @@ -1,3 +1,8 @@ 2009-05-20 Lillian Angel >> +2009-05-21 Gary Benson >>> + >>> + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: >>> + Fix for x86 debug builds. >>> + >>> 2009-05-20 Lillian Angel >>> * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of >>> diff -r 456c81041a91 -r 12f2a25cb831 >>> ports/hotspot/src/share/vm/shark/sharkCompiler.cpp >>> --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Wed May 20 16:14:38 2009 -0400 >>> +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu May 21 14:26:47 2009 +0100 >>> @@ -25,6 +25,8 @@ >>> #include "incls/_precompiled.incl" >>> #include "incls/_sharkCompiler.cpp.incl" >>> + >>> +#include >>> using namespace llvm; >>> > > From gbenson at redhat.com Thu May 21 07:36:02 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 21 May 2009 15:36:02 +0100 Subject: changeset in /hg/icedtea6: 2009-05-21 Gary Benson References: <4A155A58.7000206@redhat.com> <20090521135216.GC3170@redhat.com> <4A155F71.9000103@redhat.com> Message-ID: <20090521143602.GD3170@redhat.com> Done Lillian Angel wrote: > Might as well. > > it's under ssh://icedtea.classpath.org/hg/release/icedtea6-1.5 > > Gary Benson wrote: > > Up to you. It only matters for non-PRODUCT builds on x86, > > and nobody's noticed it til now, so... > > > > Cheers, > > Gary > > > > Lillian Angel wrote: > > > > > Do you want to apply this to the icedtea6-1.5 branch? > > > > > > Gary Benson wrote: > > > > > > > changeset 12f2a25cb831 in /hg/icedtea6 > > > > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=12f2a25cb831 > > > > description: > > > > 2009-05-21 Gary Benson > > > > > > > > * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: > > > > Fix for x86 debug builds. > > > > > > > > diffstat: > > > > > > > > 2 files changed, 7 insertions(+) > > > > ChangeLog | 5 +++++ > > > > ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2 ++ > > > > > > > > diffs (24 lines): > > > > > > > > diff -r 456c81041a91 -r 12f2a25cb831 ChangeLog > > > > --- a/ChangeLog Wed May 20 16:14:38 2009 -0400 > > > > +++ b/ChangeLog Thu May 21 14:26:47 2009 +0100 > > > > @@ -1,3 +1,8 @@ 2009-05-20 Lillian Angel > > > +2009-05-21 Gary Benson > > > > + > > > > + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: > > > > + Fix for x86 debug builds. > > > > + > > > > 2009-05-20 Lillian Angel > > > > * rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of > > > > diff -r 456c81041a91 -r 12f2a25cb831 > > > > ports/hotspot/src/share/vm/shark/sharkCompiler.cpp > > > > --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Wed May 20 16:14:38 2009 -0400 > > > > +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu May 21 14:26:47 2009 +0100 > > > > @@ -25,6 +25,8 @@ > > > > #include "incls/_precompiled.incl" > > > > #include "incls/_sharkCompiler.cpp.incl" > > > > + > > > > +#include > > > > using namespace llvm; -- http://gbenson.net/ From ahughes at redhat.com Thu May 21 08:53:48 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 15:53:48 +0000 Subject: changeset in /hg/icedtea: Update list of generated files (for ma... Message-ID: changeset 282bc825e2cb in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=282bc825e2cb description: Update list of generated files (for make distcheck) and turn off generation by default. 2009-05-21 Andrew John Hughes * Makefile.am: Update list of generated files with Nimbus source. * acinclude.m4: Turn off Nimbus source code generation by default. diffstat: 3 files changed, 96 insertions(+), 2 deletions(-) ChangeLog | 8 +++++ Makefile.am | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- acinclude.m4 | 2 - diffs (125 lines): diff -r 5b10caa4c7fd -r 282bc825e2cb ChangeLog --- a/ChangeLog Thu May 21 13:45:49 2009 +0100 +++ b/ChangeLog Thu May 21 13:48:23 2009 +0100 @@ -1,3 +1,11 @@ 2009-05-21 Andrew John Hughes + + * Makefile.am: + Update list of generated files with + Nimbus source. + * acinclude.m4: + Turn off Nimbus source code generation by default. + 2009-05-21 Andrew John Hughes * Makefile.am: diff -r 5b10caa4c7fd -r 282bc825e2cb Makefile.am --- a/Makefile.am Thu May 21 13:45:49 2009 +0100 +++ b/Makefile.am Thu May 21 13:48:23 2009 +0100 @@ -1285,7 +1285,93 @@ GENERATED_FILES = generated/com/sun/java generated/fontconfig/fontconfig.Fedora.bfc \ generated/fontconfig/fontconfig.SuSE.bfc \ generated/fontconfig/fontconfig.Ubuntu.bfc \ - generated/fontconfig/fontconfig.bfc + generated/fontconfig/fontconfig.bfc \ + generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java \ + generated/javax/swing/plaf/nimbus/ButtonPainter.java \ + generated/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java \ + generated/javax/swing/plaf/nimbus/CheckBoxPainter.java \ + generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonEditableState.java \ + generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonPainter.java \ + generated/javax/swing/plaf/nimbus/ComboBoxComboBoxTextFieldPainter.java \ + generated/javax/swing/plaf/nimbus/ComboBoxEditableState.java \ + generated/javax/swing/plaf/nimbus/ComboBoxPainter.java \ + generated/javax/swing/plaf/nimbus/DesktopIconPainter.java \ + generated/javax/swing/plaf/nimbus/DesktopPanePainter.java \ + generated/javax/swing/plaf/nimbus/EditorPanePainter.java \ + generated/javax/swing/plaf/nimbus/FileChooserPainter.java \ + generated/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonPainter.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonWindowNotFocusedState.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonPainter.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonPainter.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonPainter.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonWindowNotFocusedState.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePanePainter.java \ + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneWindowFocusedState.java \ + generated/javax/swing/plaf/nimbus/InternalFramePainter.java \ + generated/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java \ + generated/javax/swing/plaf/nimbus/MenuBarMenuPainter.java \ + generated/javax/swing/plaf/nimbus/MenuBarPainter.java \ + generated/javax/swing/plaf/nimbus/MenuItemPainter.java \ + generated/javax/swing/plaf/nimbus/MenuPainter.java \ + generated/javax/swing/plaf/nimbus/NimbusDefaults.java \ + generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaOptionPaneLabelPainter.java \ + generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaPainter.java \ + generated/javax/swing/plaf/nimbus/OptionPanePainter.java \ + generated/javax/swing/plaf/nimbus/PasswordFieldPainter.java \ + generated/javax/swing/plaf/nimbus/PopupMenuPainter.java \ + generated/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java \ + generated/javax/swing/plaf/nimbus/ProgressBarFinishedState.java \ + generated/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java \ + generated/javax/swing/plaf/nimbus/ProgressBarPainter.java \ + generated/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java \ + generated/javax/swing/plaf/nimbus/RadioButtonPainter.java \ + generated/javax/swing/plaf/nimbus/ScrollBarPainter.java \ + generated/javax/swing/plaf/nimbus/ScrollBarScrollBarButtonPainter.java \ + generated/javax/swing/plaf/nimbus/ScrollBarScrollBarThumbPainter.java \ + generated/javax/swing/plaf/nimbus/ScrollBarScrollBarTrackPainter.java \ + generated/javax/swing/plaf/nimbus/ScrollPanePainter.java \ + generated/javax/swing/plaf/nimbus/SeparatorPainter.java \ + generated/javax/swing/plaf/nimbus/SliderArrowShapeState.java \ + generated/javax/swing/plaf/nimbus/SliderPainter.java \ + generated/javax/swing/plaf/nimbus/SliderSliderThumbArrowShapeState.java \ + generated/javax/swing/plaf/nimbus/SliderSliderThumbPainter.java \ + generated/javax/swing/plaf/nimbus/SliderSliderTrackArrowShapeState.java \ + generated/javax/swing/plaf/nimbus/SliderSliderTrackPainter.java \ + generated/javax/swing/plaf/nimbus/SpinnerPainter.java \ + generated/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java \ + generated/javax/swing/plaf/nimbus/SpinnerSpinnerNextButtonPainter.java \ + generated/javax/swing/plaf/nimbus/SpinnerSpinnerPreviousButtonPainter.java \ + generated/javax/swing/plaf/nimbus/SplitPanePainter.java \ + generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerPainter.java \ + generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerVerticalState.java \ + generated/javax/swing/plaf/nimbus/SplitPaneVerticalState.java \ + generated/javax/swing/plaf/nimbus/TabbedPanePainter.java \ + generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabAreaPainter.java \ + generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabPainter.java \ + generated/javax/swing/plaf/nimbus/TableEditorPainter.java \ + generated/javax/swing/plaf/nimbus/TableHeaderPainter.java \ + generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererPainter.java \ + generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererSortedState.java \ + generated/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java \ + generated/javax/swing/plaf/nimbus/TextAreaPainter.java \ + generated/javax/swing/plaf/nimbus/TextFieldPainter.java \ + generated/javax/swing/plaf/nimbus/TextPanePainter.java \ + generated/javax/swing/plaf/nimbus/ToggleButtonPainter.java \ + generated/javax/swing/plaf/nimbus/ToolBarButtonPainter.java \ + generated/javax/swing/plaf/nimbus/ToolBarEastState.java \ + generated/javax/swing/plaf/nimbus/ToolBarNorthState.java \ + generated/javax/swing/plaf/nimbus/ToolBarPainter.java \ + generated/javax/swing/plaf/nimbus/ToolBarSouthState.java \ + generated/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java \ + generated/javax/swing/plaf/nimbus/ToolBarWestState.java \ + generated/javax/swing/plaf/nimbus/ToolTipPainter.java \ + generated/javax/swing/plaf/nimbus/TreeCellEditorPainter.java \ + generated/javax/swing/plaf/nimbus/TreePainter.java \ + generated/javax/swing/plaf/nimbus/TreeTreeCellPainter.java JTREG_SRCS = $(top_srcdir)/test/jtreg/com/sun/javatest/cof/i18n.properties \ $(top_srcdir)/test/jtreg/com/sun/javatest/cof/COF2_0_2.xsd \ diff -r 5b10caa4c7fd -r 282bc825e2cb acinclude.m4 --- a/acinclude.m4 Thu May 21 13:45:49 2009 +0100 +++ b/acinclude.m4 Thu May 21 13:48:23 2009 +0100 @@ -1508,7 +1508,7 @@ AC_DEFUN([AC_CHECK_ENABLE_NIMBUS_GENERAT ENABLE_NIMBUS_GENERATION="${enableval}" ], [ - ENABLE_NIMBUS_GENERATION=yes + ENABLE_NIMBUS_GENERATION=no ]) AC_MSG_RESULT(${ENABLE_NIMBUS_GENERATION}) From ahughes at redhat.com Thu May 21 08:53:49 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 15:53:49 +0000 Subject: changeset in /hg/icedtea: For pre-generated Nimbus, turn on DISA... Message-ID: changeset f915b5bb3fc7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f915b5bb3fc7 description: For pre-generated Nimbus, turn on DISABLE_NIMBUS but patch it out for make/javax/swing/plaf. 2009-05-21 Andrew John Hughes * patches/icedtea-stop-nimbus-generation.patch: Renamed. * Makefile.am: Turn on DISABLE_NIMBUS unless generating files. To still build, apply the pregenerated-nimbus patch. * patches/icedtea-pregenerated-nimbus.patch: Turns the make/javax/swing/plaf/nimbus subdirectory back on. diffstat: 4 files changed, 27 insertions(+), 16 deletions(-) ChangeLog | 11 +++++++++++ Makefile.am | 4 ++-- patches/icedtea-pregenerated-nimbus.patch | 14 ++++++++++++++ patches/icedtea-stop-nimbus-generation.patch | 14 -------------- diffs (75 lines): diff -r 282bc825e2cb -r f915b5bb3fc7 ChangeLog --- a/ChangeLog Thu May 21 13:48:23 2009 +0100 +++ b/ChangeLog Thu May 21 16:44:10 2009 +0100 @@ -1,3 +1,14 @@ 2009-05-21 Andrew John Hughes + + * patches/icedtea-stop-nimbus-generation.patch: + Renamed. + * Makefile.am: + Turn on DISABLE_NIMBUS unless generating files. + To still build, apply the pregenerated-nimbus patch. + * patches/icedtea-pregenerated-nimbus.patch: + Turns the make/javax/swing/plaf/nimbus subdirectory + back on. + 2009-05-21 Andrew John Hughes * Makefile.am: diff -r 282bc825e2cb -r f915b5bb3fc7 Makefile.am --- a/Makefile.am Thu May 21 13:48:23 2009 +0100 +++ b/Makefile.am Thu May 21 16:44:10 2009 +0100 @@ -1560,7 +1560,7 @@ ICEDTEA_ENV += \ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)" endif -if !ENABLE_NIMBUS +if !ENABLE_NIMBUS_GENERATION ICEDTEA_ENV += \ "DISABLE_NIMBUS=true" endif @@ -2099,7 +2099,7 @@ endif endif if !ENABLE_NIMBUS_GENERATION -ICEDTEA_PATCHES += patches/icedtea-stop-nimbus-generation.patch +ICEDTEA_PATCHES += patches/icedtea-pregenerated-nimbus.patch endif stamps/extract.stamp: stamps/download.stamp diff -r 282bc825e2cb -r f915b5bb3fc7 patches/icedtea-pregenerated-nimbus.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-pregenerated-nimbus.patch Thu May 21 16:44:10 2009 +0100 @@ -0,0 +1,14 @@ +diff -Nru openjdk.orig/jdk/make/javax/swing/plaf/Makefile openjdk/jdk/make/javax/swing/plaf/Makefile +--- openjdk.orig/jdk/make/javax/swing/plaf/Makefile 2009-05-21 16:40:04.000000000 +0100 ++++ openjdk/jdk/make/javax/swing/plaf/Makefile 2009-05-21 16:40:19.000000000 +0100 +@@ -34,9 +34,7 @@ + # + include FILES.gmk + AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf +-ifndef DISABLE_NIMBUS +- SUBDIRS = nimbus +-endif ++SUBDIRS = nimbus + + # Nimbus is handled in its own directory + AUTO_JAVA_PRUNE = nimbus diff -r 282bc825e2cb -r f915b5bb3fc7 patches/icedtea-stop-nimbus-generation.patch --- a/patches/icedtea-stop-nimbus-generation.patch Thu May 21 13:48:23 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/tools/Makefile openjdk/jdk/make/tools/Makefile ---- openjdk.orig/jdk/make/tools/Makefile 2009-05-18 22:14:05.000000000 +0100 -+++ openjdk/jdk/make/tools/Makefile 2009-05-21 12:35:38.000000000 +0100 -@@ -53,10 +53,6 @@ - spp \ - CharsetMapping - --ifndef DISABLE_NIMBUS -- SUBDIRS += swing-nimbus --endif -- - all build clean clobber:: - $(SUBDIRS-loop) - From ahughes at redhat.com Thu May 21 08:53:48 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 15:53:48 +0000 Subject: changeset in /hg/icedtea: Add support for disabling Nimbus code ... Message-ID: changeset 5b10caa4c7fd in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5b10caa4c7fd description: Add support for disabling Nimbus code generation with JIBX and instead using pre-built files. 2009-05-21 Andrew John Hughes * Makefile.am: Apply patch and use our generated source directory when ENABLE_NIMBUS_GENERATION is not enabled. Symlink JIBX when it is. * acinclude.m4: (AC_CHECK_ENABLE_NIMBUS_GENERATION): New macro. * configure.ac: Turn on ENABLE_NIMBUS_GENERATION and only check for JIBX when this is enabled. * generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java, * generated/javax/swing/plaf/nimbus/ButtonPainter.java, * generated/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java, * generated/javax/swing/plaf/nimbus/CheckBoxPainter.java, * generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonEditableState.java, * generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonPainter.java, * generated/javax/swing/plaf/nimbus/ComboBoxComboBoxTextFieldPainter.java, * generated/javax/swing/plaf/nimbus/ComboBoxEditableState.java, * generated/javax/swing/plaf/nimbus/ComboBoxPainter.java, * generated/javax/swing/plaf/nimbus/DesktopIconPainter.java, * generated/javax/swing/plaf/nimbus/DesktopPanePainter.java, * generated/javax/swing/plaf/nimbus/EditorPanePainter.java, * generated/javax/swing/plaf/nimbus/FileChooserPainter.java, * generated/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonPainter.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonWindowNotFocusedState.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonPainter.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonPainter.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonPainter.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonWindowNotFocusedState.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePanePainter.java, * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneWindowFocusedState.java, * generated/javax/swing/plaf/nimbus/InternalFramePainter.java, * generated/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java, * generated/javax/swing/plaf/nimbus/MenuBarMenuPainter.java, * generated/javax/swing/plaf/nimbus/MenuBarPainter.java, * generated/javax/swing/plaf/nimbus/MenuItemPainter.java, * generated/javax/swing/plaf/nimbus/MenuPainter.java, * generated/javax/swing/plaf/nimbus/NimbusDefaults.java, * generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaOptionPaneLabelPainter.java, * generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaPainter.java, * generated/javax/swing/plaf/nimbus/OptionPanePainter.java, * generated/javax/swing/plaf/nimbus/PasswordFieldPainter.java, * generated/javax/swing/plaf/nimbus/PopupMenuPainter.java, * generated/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java, * generated/javax/swing/plaf/nimbus/ProgressBarFinishedState.java, * generated/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java, * generated/javax/swing/plaf/nimbus/ProgressBarPainter.java, * generated/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java, * generated/javax/swing/plaf/nimbus/RadioButtonPainter.java, * generated/javax/swing/plaf/nimbus/ScrollBarPainter.java, * generated/javax/swing/plaf/nimbus/ScrollBarScrollBarButtonPainter.java, * generated/javax/swing/plaf/nimbus/ScrollBarScrollBarThumbPainter.java, * generated/javax/swing/plaf/nimbus/ScrollBarScrollBarTrackPainter.java, * generated/javax/swing/plaf/nimbus/ScrollPanePainter.java, * generated/javax/swing/plaf/nimbus/SeparatorPainter.java, * generated/javax/swing/plaf/nimbus/SliderArrowShapeState.java, * generated/javax/swing/plaf/nimbus/SliderPainter.java, * generated/javax/swing/plaf/nimbus/SliderSliderThumbArrowShapeState.java, * generated/javax/swing/plaf/nimbus/SliderSliderThumbPainter.java, * generated/javax/swing/plaf/nimbus/SliderSliderTrackArrowShapeState.java, * generated/javax/swing/plaf/nimbus/SliderSliderTrackPainter.java, * generated/javax/swing/plaf/nimbus/SpinnerPainter.java, * generated/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java, * generated/javax/swing/plaf/nimbus/SpinnerSpinnerNextButtonPainter.java, * generated/javax/swing/plaf/nimbus/SpinnerSpinnerPreviousButtonPainter.java, * generated/javax/swing/plaf/nimbus/SplitPanePainter.java, * generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerPainter.java, * generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerVerticalState.java, * generated/javax/swing/plaf/nimbus/SplitPaneVerticalState.java, * generated/javax/swing/plaf/nimbus/TabbedPanePainter.java, * generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabAreaPainter.java, * generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabPainter.java, * generated/javax/swing/plaf/nimbus/TableEditorPainter.java, * generated/javax/swing/plaf/nimbus/TableHeaderPainter.java, * generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererPainter.java, * generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererSortedState.java, * generated/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java, * generated/javax/swing/plaf/nimbus/TextAreaPainter.java, * generated/javax/swing/plaf/nimbus/TextFieldPainter.java, * generated/javax/swing/plaf/nimbus/TextPanePainter.java, * generated/javax/swing/plaf/nimbus/ToggleButtonPainter.java, * generated/javax/swing/plaf/nimbus/ToolBarButtonPainter.java, * generated/javax/swing/plaf/nimbus/ToolBarEastState.java, * generated/javax/swing/plaf/nimbus/ToolBarNorthState.java, * generated/javax/swing/plaf/nimbus/ToolBarPainter.java, * generated/javax/swing/plaf/nimbus/ToolBarSouthState.java, * generated/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java, * generated/javax/swing/plaf/nimbus/ToolBarWestState.java, * generated/javax/swing/plaf/nimbus/ToolTipPainter.java, * generated/javax/swing/plaf/nimbus/TreeCellEditorPainter.java, * generated/javax/swing/plaf/nimbus/TreePainter.java, * generated/javax/swing/plaf/nimbus/TreeTreeCellPainter.java: Add generated Nimbus files. * patches/icedtea-stop-nimbus-generation.patch: Turn off building Nimbus tool when --disable-nimbus-generation is given. diffstat: 91 files changed, 25386 insertions(+), 3 deletions(-) ChangeLog | 102 Makefile.am | 11 acinclude.m4 | 17 configure.ac | 10 generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java | 118 generated/javax/swing/plaf/nimbus/ButtonPainter.java | 652 ++ generated/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java | 162 generated/javax/swing/plaf/nimbus/CheckBoxPainter.java | 635 ++ generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonEditableState.java | 42 generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonPainter.java | 476 ++ generated/javax/swing/plaf/nimbus/ComboBoxComboBoxTextFieldPainter.java | 254 + generated/javax/swing/plaf/nimbus/ComboBoxEditableState.java | 41 generated/javax/swing/plaf/nimbus/ComboBoxPainter.java | 733 +++ generated/javax/swing/plaf/nimbus/DesktopIconPainter.java | 159 generated/javax/swing/plaf/nimbus/DesktopPanePainter.java | 350 + generated/javax/swing/plaf/nimbus/EditorPanePainter.java | 124 generated/javax/swing/plaf/nimbus/FileChooserPainter.java | 2248 ++++++++++ generated/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java | 381 + generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonPainter.java | 463 ++ generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonWindowNotFocusedState.java | 51 generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonPainter.java | 606 ++ generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java | 51 generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonPainter.java | 1045 ++++ generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java | 51 generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java | 51 generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonPainter.java | 517 ++ generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonWindowNotFocusedState.java | 51 generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePanePainter.java | 88 generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneWindowFocusedState.java | 41 generated/javax/swing/plaf/nimbus/InternalFramePainter.java | 402 + generated/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java | 41 generated/javax/swing/plaf/nimbus/MenuBarMenuPainter.java | 107 generated/javax/swing/plaf/nimbus/MenuBarPainter.java | 152 generated/javax/swing/plaf/nimbus/MenuItemPainter.java | 107 generated/javax/swing/plaf/nimbus/MenuPainter.java | 157 generated/javax/swing/plaf/nimbus/NimbusDefaults.java | 1793 +++++++ generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaOptionPaneLabelPainter.java | 105 generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaPainter.java | 88 generated/javax/swing/plaf/nimbus/OptionPanePainter.java | 583 ++ generated/javax/swing/plaf/nimbus/PasswordFieldPainter.java | 381 + generated/javax/swing/plaf/nimbus/PopupMenuPainter.java | 163 generated/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java | 105 generated/javax/swing/plaf/nimbus/ProgressBarFinishedState.java | 42 generated/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java | 42 generated/javax/swing/plaf/nimbus/ProgressBarPainter.java | 612 ++ generated/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java | 171 generated/javax/swing/plaf/nimbus/RadioButtonPainter.java | 704 +++ generated/javax/swing/plaf/nimbus/ScrollBarPainter.java | 87 generated/javax/swing/plaf/nimbus/ScrollBarScrollBarButtonPainter.java | 380 + generated/javax/swing/plaf/nimbus/ScrollBarScrollBarThumbPainter.java | 379 + generated/javax/swing/plaf/nimbus/ScrollBarScrollBarTrackPainter.java | 275 + generated/javax/swing/plaf/nimbus/ScrollPanePainter.java | 178 generated/javax/swing/plaf/nimbus/SeparatorPainter.java | 105 generated/javax/swing/plaf/nimbus/SliderArrowShapeState.java | 40 generated/javax/swing/plaf/nimbus/SliderPainter.java | 87 generated/javax/swing/plaf/nimbus/SliderSliderThumbArrowShapeState.java | 40 generated/javax/swing/plaf/nimbus/SliderSliderThumbPainter.java | 654 ++ generated/javax/swing/plaf/nimbus/SliderSliderTrackArrowShapeState.java | 40 generated/javax/swing/plaf/nimbus/SliderSliderTrackPainter.java | 229 + generated/javax/swing/plaf/nimbus/SpinnerPainter.java | 88 generated/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java | 320 + generated/javax/swing/plaf/nimbus/SpinnerSpinnerNextButtonPainter.java | 582 ++ generated/javax/swing/plaf/nimbus/SpinnerSpinnerPreviousButtonPainter.java | 504 ++ generated/javax/swing/plaf/nimbus/SplitPanePainter.java | 88 generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerPainter.java | 289 + generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerVerticalState.java | 41 generated/javax/swing/plaf/nimbus/SplitPaneVerticalState.java | 41 generated/javax/swing/plaf/nimbus/TabbedPanePainter.java | 92 generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabAreaPainter.java | 220 generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabPainter.java | 677 +++ generated/javax/swing/plaf/nimbus/TableEditorPainter.java | 134 generated/javax/swing/plaf/nimbus/TableHeaderPainter.java | 140 generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererPainter.java | 380 + generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererSortedState.java | 42 generated/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java | 41 generated/javax/swing/plaf/nimbus/TextAreaPainter.java | 411 + generated/javax/swing/plaf/nimbus/TextFieldPainter.java | 381 + generated/javax/swing/plaf/nimbus/TextPanePainter.java | 124 generated/javax/swing/plaf/nimbus/ToggleButtonPainter.java | 705 +++ generated/javax/swing/plaf/nimbus/ToolBarButtonPainter.java | 288 + generated/javax/swing/plaf/nimbus/ToolBarEastState.java | 43 generated/javax/swing/plaf/nimbus/ToolBarNorthState.java | 43 generated/javax/swing/plaf/nimbus/ToolBarPainter.java | 211 generated/javax/swing/plaf/nimbus/ToolBarSouthState.java | 43 generated/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java | 535 ++ generated/javax/swing/plaf/nimbus/ToolBarWestState.java | 43 generated/javax/swing/plaf/nimbus/ToolTipPainter.java | 150 generated/javax/swing/plaf/nimbus/TreeCellEditorPainter.java | 143 generated/javax/swing/plaf/nimbus/TreePainter.java | 652 ++ generated/javax/swing/plaf/nimbus/TreeTreeCellPainter.java | 145 patches/icedtea-stop-nimbus-generation.patch | 14 diffs (truncated from 25797 to 500 lines): diff -r 2afddd1c229e -r 5b10caa4c7fd ChangeLog --- a/ChangeLog Thu May 21 00:16:15 2009 +0100 +++ b/ChangeLog Thu May 21 13:45:49 2009 +0100 @@ -1,3 +1,105 @@ 2009-05-21 Andrew John Hughes + + * Makefile.am: + Apply patch and use our generated source directory + when ENABLE_NIMBUS_GENERATION is not enabled. Symlink + JIBX when it is. + * acinclude.m4: + (AC_CHECK_ENABLE_NIMBUS_GENERATION): New macro. + * configure.ac: + Turn on ENABLE_NIMBUS_GENERATION and only check for + JIBX when this is enabled. + * generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java, + * generated/javax/swing/plaf/nimbus/ButtonPainter.java, + * generated/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java, + * generated/javax/swing/plaf/nimbus/CheckBoxPainter.java, + * generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonEditableState.java, + * generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonPainter.java, + * generated/javax/swing/plaf/nimbus/ComboBoxComboBoxTextFieldPainter.java, + * generated/javax/swing/plaf/nimbus/ComboBoxEditableState.java, + * generated/javax/swing/plaf/nimbus/ComboBoxPainter.java, + * generated/javax/swing/plaf/nimbus/DesktopIconPainter.java, + * generated/javax/swing/plaf/nimbus/DesktopPanePainter.java, + * generated/javax/swing/plaf/nimbus/EditorPanePainter.java, + * generated/javax/swing/plaf/nimbus/FileChooserPainter.java, + * generated/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonPainter.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonWindowNotFocusedState.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonPainter.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonPainter.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonPainter.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonWindowNotFocusedState.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePanePainter.java, + * generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneWindowFocusedState.java, + * generated/javax/swing/plaf/nimbus/InternalFramePainter.java, + * generated/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java, + * generated/javax/swing/plaf/nimbus/MenuBarMenuPainter.java, + * generated/javax/swing/plaf/nimbus/MenuBarPainter.java, + * generated/javax/swing/plaf/nimbus/MenuItemPainter.java, + * generated/javax/swing/plaf/nimbus/MenuPainter.java, + * generated/javax/swing/plaf/nimbus/NimbusDefaults.java, + * generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaOptionPaneLabelPainter.java, + * generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaPainter.java, + * generated/javax/swing/plaf/nimbus/OptionPanePainter.java, + * generated/javax/swing/plaf/nimbus/PasswordFieldPainter.java, + * generated/javax/swing/plaf/nimbus/PopupMenuPainter.java, + * generated/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java, + * generated/javax/swing/plaf/nimbus/ProgressBarFinishedState.java, + * generated/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java, + * generated/javax/swing/plaf/nimbus/ProgressBarPainter.java, + * generated/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java, + * generated/javax/swing/plaf/nimbus/RadioButtonPainter.java, + * generated/javax/swing/plaf/nimbus/ScrollBarPainter.java, + * generated/javax/swing/plaf/nimbus/ScrollBarScrollBarButtonPainter.java, + * generated/javax/swing/plaf/nimbus/ScrollBarScrollBarThumbPainter.java, + * generated/javax/swing/plaf/nimbus/ScrollBarScrollBarTrackPainter.java, + * generated/javax/swing/plaf/nimbus/ScrollPanePainter.java, + * generated/javax/swing/plaf/nimbus/SeparatorPainter.java, + * generated/javax/swing/plaf/nimbus/SliderArrowShapeState.java, + * generated/javax/swing/plaf/nimbus/SliderPainter.java, + * generated/javax/swing/plaf/nimbus/SliderSliderThumbArrowShapeState.java, + * generated/javax/swing/plaf/nimbus/SliderSliderThumbPainter.java, + * generated/javax/swing/plaf/nimbus/SliderSliderTrackArrowShapeState.java, + * generated/javax/swing/plaf/nimbus/SliderSliderTrackPainter.java, + * generated/javax/swing/plaf/nimbus/SpinnerPainter.java, + * generated/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java, + * generated/javax/swing/plaf/nimbus/SpinnerSpinnerNextButtonPainter.java, + * generated/javax/swing/plaf/nimbus/SpinnerSpinnerPreviousButtonPainter.java, + * generated/javax/swing/plaf/nimbus/SplitPanePainter.java, + * generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerPainter.java, + * generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerVerticalState.java, + * generated/javax/swing/plaf/nimbus/SplitPaneVerticalState.java, + * generated/javax/swing/plaf/nimbus/TabbedPanePainter.java, + * generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabAreaPainter.java, + * generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabPainter.java, + * generated/javax/swing/plaf/nimbus/TableEditorPainter.java, + * generated/javax/swing/plaf/nimbus/TableHeaderPainter.java, + * generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererPainter.java, + * generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererSortedState.java, + * generated/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java, + * generated/javax/swing/plaf/nimbus/TextAreaPainter.java, + * generated/javax/swing/plaf/nimbus/TextFieldPainter.java, + * generated/javax/swing/plaf/nimbus/TextPanePainter.java, + * generated/javax/swing/plaf/nimbus/ToggleButtonPainter.java, + * generated/javax/swing/plaf/nimbus/ToolBarButtonPainter.java, + * generated/javax/swing/plaf/nimbus/ToolBarEastState.java, + * generated/javax/swing/plaf/nimbus/ToolBarNorthState.java, + * generated/javax/swing/plaf/nimbus/ToolBarPainter.java, + * generated/javax/swing/plaf/nimbus/ToolBarSouthState.java, + * generated/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java, + * generated/javax/swing/plaf/nimbus/ToolBarWestState.java, + * generated/javax/swing/plaf/nimbus/ToolTipPainter.java, + * generated/javax/swing/plaf/nimbus/TreeCellEditorPainter.java, + * generated/javax/swing/plaf/nimbus/TreePainter.java, + * generated/javax/swing/plaf/nimbus/TreeTreeCellPainter.java: + Add generated Nimbus files. + * patches/icedtea-stop-nimbus-generation.patch: + Turn off building Nimbus tool when --disable-nimbus-generation + is given. + 2009-05-21 Andrew John Hughes * Makefile.am: diff -r 2afddd1c229e -r 5b10caa4c7fd Makefile.am --- a/Makefile.am Thu May 21 00:16:15 2009 +0100 +++ b/Makefile.am Thu May 21 13:45:49 2009 +0100 @@ -1495,6 +1495,11 @@ ICEDTEA_ENV += \ "ALT_JAR_CMD=$(ALT_JAR_CMD)" endif +if !ENABLE_NIMBUS_GENERATION +ICEDTEA_ENV += \ + "GENSRCDIR=$(abs_top_builddir)/generated" +endif + env: @echo 'unset JAVA_HOME' @echo 'export $(ICEDTEA_ENV)' @@ -2007,6 +2012,10 @@ ICEDTEA_PATCHES += patches/icedtea-syste ICEDTEA_PATCHES += patches/icedtea-systemtap.patch endif +if !ENABLE_NIMBUS_GENERATION +ICEDTEA_PATCHES += patches/icedtea-stop-nimbus-generation.patch +endif + stamps/extract.stamp: stamps/download.stamp if OPENJDK_SRC_DIR_FOUND cp -a $(OPENJDK_SRC_DIR) openjdk @@ -3039,11 +3048,13 @@ extra-lib/about.jar: stamps/extra-class- stamps/jibx.stamp: extra-lib/about.jar if ENABLE_NIMBUS +if ENABLE_NIMBUS_GENERATION mkdir $(JIBX_DEPS_DIR) ln -s $(BCEL_JAR) $(JIBX_DEPS_DIR) ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR) ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR) ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR) +endif endif mkdir -p stamps touch $@ diff -r 2afddd1c229e -r 5b10caa4c7fd acinclude.m4 --- a/acinclude.m4 Thu May 21 00:16:15 2009 +0100 +++ b/acinclude.m4 Thu May 21 13:45:49 2009 +0100 @@ -1498,3 +1498,20 @@ AC_LANG_POP([C++]) AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) ]) + +AC_DEFUN([AC_CHECK_ENABLE_NIMBUS_GENERATION], +[ + AC_MSG_CHECKING(whether to generate the Nimbus source files using JIBX) + AC_ARG_ENABLE([nimbus-generation], + [AS_HELP_STRING(--enable-nimbus-generation,generate the Nimbus source with JIBX [[default=yes]])], + [ + ENABLE_NIMBUS_GENERATION="${enableval}" + ], + [ + ENABLE_NIMBUS_GENERATION=yes + ]) + + AC_MSG_RESULT(${ENABLE_NIMBUS_GENERATION}) + AM_CONDITIONAL(ENABLE_NIMBUS_GENERATION, test x"${ENABLE_NIMBUS_GENERATION}" = "xyes") + AC_SUBST(ENABLE_NIMBUS_GENERATION) +]) diff -r 2afddd1c229e -r 5b10caa4c7fd configure.ac --- a/configure.ac Thu May 21 00:16:15 2009 +0100 +++ b/configure.ac Thu May 21 13:45:49 2009 +0100 @@ -310,6 +310,7 @@ AC_CHECK_WITH_CACAO_HOME AC_CHECK_WITH_CACAO_HOME AC_CHECK_WITH_CACAO_SRC_ZIP AC_CHECK_ENABLE_NIMBUS +AC_CHECK_ENABLE_NIMBUS_GENERATION ENABLE_OPTIMIZATIONS SET_SHARK_BUILD ENABLE_ZERO_BUILD @@ -346,9 +347,12 @@ fi if test "x${ENABLE_NIMBUS}" = "xyes" then -FIND_BCEL_JAR -FIND_XPP3_JAR -FIND_JIBX_DIR + if test "x${ENABLE_NIMBUS_GENERATION}" = "xyes" + then + FIND_BCEL_JAR + FIND_XPP3_JAR + FIND_JIBX_DIR + fi fi dnl pkgconfig cannot be used to find these headers and libraries. diff -r 2afddd1c229e -r 5b10caa4c7fd generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java Thu May 21 13:45:49 2009 +0100 @@ -0,0 +1,118 @@ +/* + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ +package javax.swing.plaf.nimbus; + +import java.awt.*; +import java.awt.geom.*; +import java.awt.image.*; +import javax.swing.*; +import javax.swing.Painter; + + +public final class ArrowButtonPainter extends AbstractRegionPainter { + //package private integers representing the available states that + //this painter will paint. These are used when creating a new instance + //of ArrowButtonPainter to determine which region/state is being painted + //by that instance. + static final int BACKGROUND_ENABLED = 1; + static final int FOREGROUND_DISABLED = 2; + static final int FOREGROUND_ENABLED = 3; + + + private int state; //refers to one of the static final ints above + private PaintContext ctx; + + //the following 4 variables are reused during the painting code of the layers + private Path2D path = new Path2D.Float(); + private Rectangle2D rect = new Rectangle2D.Float(0, 0, 0, 0); + private RoundRectangle2D roundRect = new RoundRectangle2D.Float(0, 0, 0, 0, 0, 0); + private Ellipse2D ellipse = new Ellipse2D.Float(0, 0, 0, 0); + + //All Colors used for painting are stored here. Ideally, only those colors being used + //by a particular instance of ArrowButtonPainter would be created. For the moment at least, + //however, all are created for each instance. + private Color color1 = decodeColor("nimbusBase", 0.027408898f, -0.57391655f, 0.1490196f, 0); + private Color color2 = decodeColor("nimbusBase", -0.57865167f, -0.6357143f, -0.37254906f, 0); + + + //Array of current component colors, updated in each paint call + private Object[] componentColors; + + public ArrowButtonPainter(PaintContext ctx, int state) { + super(); + this.state = state; + this.ctx = ctx; + } + + @Override + protected void doPaint(Graphics2D g, JComponent c, int width, int height, Object[] extendedCacheKeys) { + //populate componentColors array with colors calculated in getExtendedCacheKeys call + componentColors = extendedCacheKeys; + //generate this entire method. Each state/bg/fg/border combo that has + //been painted gets its own KEY and paint method. + switch(state) { + case FOREGROUND_DISABLED: paintForegroundDisabled(g); break; + case FOREGROUND_ENABLED: paintForegroundEnabled(g); break; + + } + } + + + + @Override + protected final PaintContext getPaintContext() { + return ctx; + } + + private void paintForegroundDisabled(Graphics2D g) { + path = decodePath1(); + g.setPaint(color1); + g.fill(path); + + } + + private void paintForegroundEnabled(Graphics2D g) { + path = decodePath1(); + g.setPaint(color2); + g.fill(path); + + } + + + + private Path2D decodePath1() { + path.reset(); + path.moveTo(decodeX(1.8f), decodeY(1.2f)); + path.lineTo(decodeX(1.2f), decodeY(1.5f)); + path.lineTo(decodeX(1.8f), decodeY(1.8f)); + path.lineTo(decodeX(1.8f), decodeY(1.2f)); + path.closePath(); + return path; + } + + + + +} diff -r 2afddd1c229e -r 5b10caa4c7fd generated/javax/swing/plaf/nimbus/ButtonPainter.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/javax/swing/plaf/nimbus/ButtonPainter.java Thu May 21 13:45:49 2009 +0100 @@ -0,0 +1,652 @@ +/* + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ +package javax.swing.plaf.nimbus; + +import java.awt.*; +import java.awt.geom.*; +import java.awt.image.*; +import javax.swing.*; +import javax.swing.Painter; + + +public final class ButtonPainter extends AbstractRegionPainter { + //package private integers representing the available states that + //this painter will paint. These are used when creating a new instance + //of ButtonPainter to determine which region/state is being painted + //by that instance. + static final int BACKGROUND_DEFAULT = 1; + static final int BACKGROUND_DEFAULT_FOCUSED = 2; + static final int BACKGROUND_MOUSEOVER_DEFAULT = 3; + static final int BACKGROUND_MOUSEOVER_DEFAULT_FOCUSED = 4; + static final int BACKGROUND_PRESSED_DEFAULT = 5; + static final int BACKGROUND_PRESSED_DEFAULT_FOCUSED = 6; + static final int BACKGROUND_DISABLED = 7; + static final int BACKGROUND_ENABLED = 8; + static final int BACKGROUND_FOCUSED = 9; + static final int BACKGROUND_MOUSEOVER = 10; + static final int BACKGROUND_MOUSEOVER_FOCUSED = 11; + static final int BACKGROUND_PRESSED = 12; + static final int BACKGROUND_PRESSED_FOCUSED = 13; + + + private int state; //refers to one of the static final ints above + private PaintContext ctx; + + //the following 4 variables are reused during the painting code of the layers + private Path2D path = new Path2D.Float(); + private Rectangle2D rect = new Rectangle2D.Float(0, 0, 0, 0); + private RoundRectangle2D roundRect = new RoundRectangle2D.Float(0, 0, 0, 0, 0, 0); + private Ellipse2D ellipse = new Ellipse2D.Float(0, 0, 0, 0); + + //All Colors used for painting are stored here. Ideally, only those colors being used + //by a particular instance of ButtonPainter would be created. For the moment at least, + //however, all are created for each instance. + private Color color1 = decodeColor("nimbusBlueGrey", -0.027777791f, -0.06885965f, -0.36862746f, -190); + private Color color2 = decodeColor("nimbusBase", 5.1498413E-4f, -0.34585923f, -0.007843137f, 0); + private Color color3 = decodeColor("nimbusBase", 5.1498413E-4f, -0.095173776f, -0.25882354f, 0); + private Color color4 = decodeColor("nimbusBase", 0.004681647f, -0.6197143f, 0.43137252f, 0); + private Color color5 = decodeColor("nimbusBase", 0.004681647f, -0.5766426f, 0.38039213f, 0); + private Color color6 = decodeColor("nimbusBase", 5.1498413E-4f, -0.43866998f, 0.24705881f, 0); + private Color color7 = decodeColor("nimbusBase", 5.1498413E-4f, -0.46404046f, 0.36470586f, 0); + private Color color8 = decodeColor("nimbusBase", 5.1498413E-4f, -0.47761154f, 0.44313723f, 0); + private Color color9 = decodeColor("nimbusFocus", 0.0f, 0.0f, 0.0f, 0); + private Color color10 = decodeColor("nimbusBase", 0.0013483167f, -0.1769987f, -0.12156865f, 0); + private Color color11 = decodeColor("nimbusBase", 0.059279382f, 0.3642857f, -0.43529415f, 0); + private Color color12 = decodeColor("nimbusBase", 0.004681647f, -0.6198413f, 0.43921566f, 0); + private Color color13 = decodeColor("nimbusBase", -0.0017285943f, -0.5822163f, 0.40392154f, 0); + private Color color14 = decodeColor("nimbusBase", 5.1498413E-4f, -0.4555341f, 0.3215686f, 0); + private Color color15 = decodeColor("nimbusBase", 5.1498413E-4f, -0.47698414f, 0.43921566f, 0); + private Color color16 = decodeColor("nimbusBase", -0.06415892f, -0.5455182f, 0.45098037f, 0); + private Color color17 = decodeColor("nimbusBlueGrey", 0.0f, -0.110526316f, 0.25490195f, -95); + private Color color18 = decodeColor("nimbusBase", -0.57865167f, -0.6357143f, -0.54901963f, 0); + private Color color19 = decodeColor("nimbusBase", -3.528595E-5f, 0.018606722f, -0.23137257f, 0); + private Color color20 = decodeColor("nimbusBase", -4.2033195E-4f, -0.38050595f, 0.20392156f, 0); + private Color color21 = decodeColor("nimbusBase", 0.001903832f, -0.29863563f, 0.1490196f, 0); + private Color color22 = decodeColor("nimbusBase", 0.0f, 0.0f, 0.0f, 0); + private Color color23 = decodeColor("nimbusBase", 0.0018727183f, -0.14126986f, 0.15686274f, 0); + private Color color24 = decodeColor("nimbusBase", 8.9377165E-4f, -0.20852983f, 0.2588235f, 0); + private Color color25 = decodeColor("nimbusBlueGrey", -0.027777791f, -0.06885965f, -0.36862746f, -232); + private Color color26 = decodeColor("nimbusBlueGrey", 0.0f, -0.06766917f, 0.07843137f, 0); + private Color color27 = decodeColor("nimbusBlueGrey", 0.0f, -0.06484103f, 0.027450979f, 0); + private Color color28 = decodeColor("nimbusBlueGrey", 0.0f, -0.08477524f, 0.16862744f, 0); + private Color color29 = decodeColor("nimbusBlueGrey", -0.015872955f, -0.080091536f, 0.15686274f, 0); + private Color color30 = decodeColor("nimbusBlueGrey", 0.0f, -0.07016757f, 0.12941176f, 0); + private Color color31 = decodeColor("nimbusBlueGrey", 0.0f, -0.07052632f, 0.1372549f, 0); + private Color color32 = decodeColor("nimbusBlueGrey", 0.0f, -0.070878744f, 0.14509803f, 0); + private Color color33 = decodeColor("nimbusBlueGrey", -0.055555522f, -0.05356429f, -0.12549019f, 0); + private Color color34 = decodeColor("nimbusBlueGrey", 0.0f, -0.0147816315f, -0.3764706f, 0); + private Color color35 = decodeColor("nimbusBlueGrey", 0.055555582f, -0.10655806f, 0.24313724f, 0); + private Color color36 = decodeColor("nimbusBlueGrey", 0.0f, -0.09823123f, 0.2117647f, 0); + private Color color37 = decodeColor("nimbusBlueGrey", 0.0f, -0.0749532f, 0.24705881f, 0); + private Color color38 = decodeColor("nimbusBlueGrey", 0.0f, -0.110526316f, 0.25490195f, 0); + private Color color39 = decodeColor("nimbusBlueGrey", 0.0f, -0.020974077f, -0.21960783f, 0); + private Color color40 = decodeColor("nimbusBlueGrey", 0.0f, 0.11169591f, -0.53333336f, 0); + private Color color41 = decodeColor("nimbusBlueGrey", 0.055555582f, -0.10658931f, 0.25098038f, 0); + private Color color42 = decodeColor("nimbusBlueGrey", 0.0f, -0.098526314f, 0.2352941f, 0); + private Color color43 = decodeColor("nimbusBlueGrey", 0.0f, -0.07333623f, 0.20392156f, 0); + private Color color44 = new Color(245, 250, 255, 160); + private Color color45 = decodeColor("nimbusBlueGrey", 0.055555582f, 0.8894737f, -0.7176471f, 0); + private Color color46 = decodeColor("nimbusBlueGrey", 0.0f, 5.847961E-4f, -0.32156864f, 0); + private Color color47 = decodeColor("nimbusBlueGrey", -0.00505054f, -0.05960039f, 0.10196078f, 0); + private Color color48 = decodeColor("nimbusBlueGrey", -0.008547008f, -0.04772438f, 0.06666666f, 0); + private Color color49 = decodeColor("nimbusBlueGrey", -0.0027777553f, -0.0018306673f, -0.02352941f, 0); + private Color color50 = decodeColor("nimbusBlueGrey", -0.0027777553f, -0.0212406f, 0.13333333f, 0); + private Color color51 = decodeColor("nimbusBlueGrey", 0.0055555105f, -0.030845039f, 0.23921567f, 0); + + + //Array of current component colors, updated in each paint call + private Object[] componentColors; + + public ButtonPainter(PaintContext ctx, int state) { + super(); + this.state = state; + this.ctx = ctx; + } + + @Override + protected void doPaint(Graphics2D g, JComponent c, int width, int height, Object[] extendedCacheKeys) { + //populate componentColors array with colors calculated in getExtendedCacheKeys call + componentColors = extendedCacheKeys; + //generate this entire method. Each state/bg/fg/border combo that has + //been painted gets its own KEY and paint method. + switch(state) { + case BACKGROUND_DEFAULT: paintBackgroundDefault(g); break; + case BACKGROUND_DEFAULT_FOCUSED: paintBackgroundDefaultAndFocused(g); break; + case BACKGROUND_MOUSEOVER_DEFAULT: paintBackgroundMouseOverAndDefault(g); break; + case BACKGROUND_MOUSEOVER_DEFAULT_FOCUSED: paintBackgroundMouseOverAndDefaultAndFocused(g); break; + case BACKGROUND_PRESSED_DEFAULT: paintBackgroundPressedAndDefault(g); break; + case BACKGROUND_PRESSED_DEFAULT_FOCUSED: paintBackgroundPressedAndDefaultAndFocused(g); break; + case BACKGROUND_DISABLED: paintBackgroundDisabled(g); break; + case BACKGROUND_ENABLED: paintBackgroundEnabled(g); break; + case BACKGROUND_FOCUSED: paintBackgroundFocused(g); break; + case BACKGROUND_MOUSEOVER: paintBackgroundMouseOver(g); break; + case BACKGROUND_MOUSEOVER_FOCUSED: paintBackgroundMouseOverAndFocused(g); break; + case BACKGROUND_PRESSED: paintBackgroundPressed(g); break; + case BACKGROUND_PRESSED_FOCUSED: paintBackgroundPressedAndFocused(g); break; + + } + } + + protected Object[] getExtendedCacheKeys(JComponent c) { + Object[] extendedCacheKeys = null; + switch(state) { + case BACKGROUND_DEFAULT: + extendedCacheKeys = new Object[] { + getComponentColor(c, "background", color4, -0.6197143f, 0.43137252f, 0), + getComponentColor(c, "background", color5, -0.5766426f, 0.38039213f, 0), + getComponentColor(c, "background", color6, -0.43866998f, 0.24705881f, 0), + getComponentColor(c, "background", color7, -0.46404046f, 0.36470586f, 0), + getComponentColor(c, "background", color8, -0.47761154f, 0.44313723f, 0)}; + break; + case BACKGROUND_DEFAULT_FOCUSED: + extendedCacheKeys = new Object[] { + getComponentColor(c, "background", color4, -0.6197143f, 0.43137252f, 0), + getComponentColor(c, "background", color5, -0.5766426f, 0.38039213f, 0), + getComponentColor(c, "background", color6, -0.43866998f, 0.24705881f, 0), + getComponentColor(c, "background", color7, -0.46404046f, 0.36470586f, 0), + getComponentColor(c, "background", color8, -0.47761154f, 0.44313723f, 0)}; + break; + case BACKGROUND_MOUSEOVER_DEFAULT: + extendedCacheKeys = new Object[] { + getComponentColor(c, "background", color12, -0.6198413f, 0.43921566f, 0), + getComponentColor(c, "background", color13, -0.5822163f, 0.40392154f, 0), From ahughes at redhat.com Thu May 21 09:12:17 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 16:12:17 +0000 Subject: changeset in /hg/icedtea: Fix ecj build where gcj 4.3 or 4.4 is ... Message-ID: changeset 5adda0d4b9f5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5adda0d4b9f5 description: Fix ecj build where gcj 4.3 or 4.4 is used. 2009-05-21 Andrew John Hughes * patches/ecj/icedtea-pr39408.patch: Updated to put the file in the state where PR40188 is present so that gcj 4.3/4.4 builds work. diffstat: 2 files changed, 15 insertions(+), 8 deletions(-) ChangeLog | 7 +++++++ patches/ecj/icedtea-pr39408.patch | 16 ++++++++-------- diffs (40 lines): diff -r f915b5bb3fc7 -r 5adda0d4b9f5 ChangeLog --- a/ChangeLog Thu May 21 16:44:10 2009 +0100 +++ b/ChangeLog Thu May 21 17:09:13 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-21 Andrew John Hughes + + * patches/ecj/icedtea-pr39408.patch: + Updated to put the file in the state + where PR40188 is present so that gcj 4.3 + builds work. + 2009-05-21 Andrew John Hughes * patches/icedtea-stop-nimbus-generation.patch: diff -r f915b5bb3fc7 -r 5adda0d4b9f5 patches/ecj/icedtea-pr39408.patch --- a/patches/ecj/icedtea-pr39408.patch Thu May 21 16:44:10 2009 +0100 +++ b/patches/ecj/icedtea-pr39408.patch Thu May 21 17:09:13 2009 +0100 @@ -5,14 +5,14 @@ diff -Nru openjdk.orig/jdk/src/solaris/n #include "nio.h" #include "nio_util.h" -+#undef sun_nio_ch_FileDispatcherImpl_NO_LOCK -+#define sun_nio_ch_FileDispatcherImpl_NO_LOCK -1L -+#undef sun_nio_ch_FileDispatcherImpl_LOCKED -+#define sun_nio_ch_FileDispatcherImpl_LOCKED 0L -+#undef sun_nio_ch_FileDispatcherImpl_RET_EX_LOCK -+#define sun_nio_ch_FileDispatcherImpl_RET_EX_LOCK 1L -+#undef sun_nio_ch_FileDispatcherImpl_INTERRUPTED -+#define sun_nio_ch_FileDispatcherImpl_INTERRUPTED 2L ++#undef sun_nio_ch_FileDispatcher_NO_LOCK ++#define sun_nio_ch_FileDispatcher_NO_LOCK -1L ++#undef sun_nio_ch_FileDispatcher_LOCKED ++#define sun_nio_ch_FileDispatcher_LOCKED 0L ++#undef sun_nio_ch_FileDispatcher_RET_EX_LOCK ++#define sun_nio_ch_FileDispatcher_RET_EX_LOCK 1L ++#undef sun_nio_ch_FileDispatcher_INTERRUPTED ++#define sun_nio_ch_FileDispatcher_INTERRUPTED 2L static int preCloseFD = -1; /* File descriptor to which we dup other fd's before closing them for real */ From ahughes at redhat.com Thu May 21 09:12:18 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 16:12:18 +0000 Subject: changeset in /hg/icedtea: Avoid invoking the generator in the Ni... Message-ID: changeset a9c10241b227 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a9c10241b227 description: Avoid invoking the generator in the Nimbus makefile. 2009-05-21 Andrew John Hughes * patches/icedtea-pregenerated-nimbus.patch: Also patch the Nimbus Makefile to not set CLASSES_INIT and thus avoid invoking the generator. diffstat: 2 files changed, 19 insertions(+) ChangeLog | 7 +++++++ patches/icedtea-pregenerated-nimbus.patch | 12 ++++++++++++ diffs (33 lines): diff -r 5adda0d4b9f5 -r a9c10241b227 ChangeLog --- a/ChangeLog Thu May 21 17:09:13 2009 +0100 +++ b/ChangeLog Thu May 21 17:14:27 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-21 Andrew John Hughes + + * patches/icedtea-pregenerated-nimbus.patch: + Also patch the Nimbus Makefile to not set + CLASSES_INIT and thus avoid invoking the + generator. + 2009-05-21 Andrew John Hughes * patches/ecj/icedtea-pr39408.patch: diff -r 5adda0d4b9f5 -r a9c10241b227 patches/icedtea-pregenerated-nimbus.patch --- a/patches/icedtea-pregenerated-nimbus.patch Thu May 21 17:09:13 2009 +0100 +++ b/patches/icedtea-pregenerated-nimbus.patch Thu May 21 17:14:27 2009 +0100 @@ -12,3 +12,15 @@ diff -Nru openjdk.orig/jdk/make/javax/sw # Nimbus is handled in its own directory AUTO_JAVA_PRUNE = nimbus +diff -Nru openjdk.orig/jdk/make/javax/swing/plaf/nimbus/Makefile openjdk/jdk/make/javax/swing/plaf/nimbus/Makefile +--- openjdk.orig/jdk/make/javax/swing/plaf/nimbus/Makefile 2009-05-08 16:10:44.000000000 +0100 ++++ openjdk/jdk/make/javax/swing/plaf/nimbus/Makefile 2009-05-21 17:12:39.000000000 +0100 +@@ -44,8 +44,6 @@ + # + # Rules + # +-CLASSES_INIT = $(NIMBUS_GENSRC_DIR) +- + include $(BUILDDIR)/common/Classes.gmk + + $(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR) From ahughes at redhat.com Thu May 21 09:56:02 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 16:56:02 +0000 Subject: changeset in /hg/icedtea: Remove @Override annotations that caus... Message-ID: changeset 08e2220c7392 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=08e2220c7392 description: Remove @Override annotations that cause ecj issues. 2009-05-21 Andrew John Hughes * generated/javax/swing/plaf/nimbus/NimbusDefaults.java: Remove @Override annotations which cause ecj to spew. diffstat: 2 files changed, 9 insertions(+), 9 deletions(-) ChangeLog | 7 ++++++- generated/javax/swing/plaf/nimbus/NimbusDefaults.java | 11 +++-------- diffs (88 lines): diff -r a9c10241b227 -r 08e2220c7392 ChangeLog --- a/ChangeLog Thu May 21 17:14:27 2009 +0100 +++ b/ChangeLog Thu May 21 17:56:41 2009 +0100 @@ -1,3 +1,8 @@ 2009-05-21 Andrew John Hughes + + * generated/javax/swing/plaf/nimbus/NimbusDefaults.java: + Remove @Override annotations which cause ecj to spew. + 2009-05-21 Andrew John Hughes * patches/icedtea-pregenerated-nimbus.patch: @@ -9,7 +14,7 @@ 2009-05-21 Andrew John Hughes diff -r a9c10241b227 -r 08e2220c7392 generated/javax/swing/plaf/nimbus/NimbusDefaults.java --- a/generated/javax/swing/plaf/nimbus/NimbusDefaults.java Thu May 21 17:14:27 2009 +0100 +++ b/generated/javax/swing/plaf/nimbus/NimbusDefaults.java Thu May 21 17:56:41 2009 +0100 @@ -1237,7 +1237,6 @@ final class NimbusDefaults { /** * @inheritDoc */ - @Override public Object createValue(UIDefaults defaults) { Font f = defaults.getFont(parentKey); if (f != null) { @@ -1309,7 +1308,6 @@ final class NimbusDefaults { insets, canvasSize, inverted, cacheMode, maxH, maxV); } - @Override public Object createValue(UIDefaults table) { try { Class c; @@ -1663,7 +1661,7 @@ final class NimbusDefaults { this.uiResource = uiResource; } - @Override + public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof DerivedColorKey)) return false; @@ -1679,7 +1677,7 @@ final class NimbusDefaults { return true; } - @Override + public int hashCode() { int result = super.hashCode(); result = 31 * result + uiDefaultParentName.hashCode(); @@ -1699,7 +1697,7 @@ final class NimbusDefaults { * Listener to update derived colors on UIManager Defaults changes */ private class DefaultsListener implements PropertyChangeListener { - @Override + public void propertyChange(PropertyChangeEvent evt) { Object src = evt.getSource(); String key = evt.getPropertyName(); @@ -1758,7 +1756,6 @@ final class NimbusDefaults { this.painterKey = painterKey; } - @Override public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { if (painter == null) { painter = (Painter)UIManager.get(painterKey); @@ -1779,12 +1776,10 @@ final class NimbusDefaults { g.translate(-x, -y); } - @Override public Insets getBorderInsets(Component c) { return (Insets)insets.clone(); } - @Override public boolean isBorderOpaque() { return false; } From ahughes at redhat.com Thu May 21 10:22:47 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 17:22:47 +0000 Subject: changeset in /hg/icedtea: Include aph's LCMS patch. Message-ID: changeset d0ad06682da3 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d0ad06682da3 description: Include aph's LCMS patch. 2009-05-21 Andrew John Hughes * Makefile.am: Bump JDK changeset/md5sum to include aph's LCMS patch. diffstat: 2 files changed, 8 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 4 ++-- diffs (34 lines): diff -r 08e2220c7392 -r d0ad06682da3 ChangeLog --- a/ChangeLog Thu May 21 17:56:41 2009 +0100 +++ b/ChangeLog Thu May 21 18:24:58 2009 +0100 @@ -1,3 +1,9 @@ 2009-05-21 Andrew John Hughes + + * Makefile.am: + Bump JDK changeset/md5sum to include aph's + LCMS patch. + 2009-05-21 Andrew John Hughes * generated/javax/swing/plaf/nimbus/NimbusDefaults.java: diff -r 08e2220c7392 -r d0ad06682da3 Makefile.am --- a/Makefile.am Thu May 21 17:56:41 2009 +0100 +++ b/Makefile.am Thu May 21 18:24:58 2009 +0100 @@ -4,7 +4,7 @@ CORBA_CHANGESET = e9ba2b962ddf CORBA_CHANGESET = e9ba2b962ddf JAXP_CHANGESET = 748976d69503 JAXWS_CHANGESET = faac46e2e60f -JDK_CHANGESET = 2dd6aaa32d8a +JDK_CHANGESET = 567b20871c5d LANGTOOLS_CHANGESET = 0f653be1a42f HOTSPOT_CHANGESET = aa0c48844632 @@ -12,7 +12,7 @@ CORBA_MD5SUM = 13b64a402845a469cae31e04f CORBA_MD5SUM = 13b64a402845a469cae31e04ffc5ee80 JAXP_MD5SUM = 18c922319545d7e907a2d6cbb265865d JAXWS_MD5SUM = b2c0a779e349f82427a78485ef53321b -JDK_MD5SUM = 93af337ffa87c10c2b90e0938fedf3ee +JDK_MD5SUM = cdd6f2d448f65e92a4349e2f83873278 LANGTOOLS_MD5SUM = ccad721f71ab49a61bbf684039b4d55d HOTSPOT_MD5SUM = c40c25a481a1c33ac15a89812a0b9f8c From langel at redhat.com Thu May 21 11:54:44 2009 From: langel at redhat.com (Lillian Angel) Date: Thu, 21 May 2009 18:54:44 +0000 Subject: changeset in /hg/icedtea: 2009-05-21 Lillian Angel changeset cf06793370fe in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cf06793370fe description: 2009-05-21 Lillian Angel * .hgignore: Updated. diffstat: 2 files changed, 24 insertions(+) .hgignore | 20 ++++++++++++++++++++ ChangeLog | 4 ++++ diffs (52 lines): diff -r d0ad06682da3 -r cf06793370fe .hgignore --- a/.hgignore Thu May 21 18:24:58 2009 +0100 +++ b/.hgignore Thu May 21 14:55:51 2009 -0400 @@ -3,6 +3,7 @@ syntax: glob syntax: regexp configure +missing aclocal.m4 autom4te.cache cacao @@ -461,6 +462,20 @@ rt/netscape/javascript/JSProxy.java rt/netscape/javascript/JSProxy.java rt/netscape/javascript/JSRunnable.java rt/netscape/javascript/JSUtil.java +rt/com/sun/net/httpserver/Authenticator.java +rt/com/sun/net/httpserver/BasicAuthenticator.java +rt/com/sun/net/httpserver/Filter.java +rt/com/sun/net/httpserver/Headers.java +rt/com/sun/net/httpserver/HttpContext.java +rt/com/sun/net/httpserver/HttpExchange.java +rt/com/sun/net/httpserver/HttpHandler.java +rt/com/sun/net/httpserver/HttpPrincipal.java +rt/com/sun/net/httpserver/HttpServer.java +rt/com/sun/net/httpserver/HttpsConfigurator.java +rt/com/sun/net/httpserver/HttpsExchange.java +rt/com/sun/net/httpserver/HttpsParameters.java +rt/com/sun/net/httpserver/HttpsServer.java +rt/com/sun/net/httpserver/package-info.java generated/sun/awt/X11/generator/sizer.32.orig pulseaudio/bin pulseaudio/.*\.o @@ -468,3 +483,8 @@ pulseaudio/.*jar pulseaudio/.*jar pulse-java.jar hotspot.tar.gz +corba.tar.gz +jaxp.tar.gz +jaxws.tar.gz +jdk.tar.gz +langtools.tar.gz diff -r d0ad06682da3 -r cf06793370fe ChangeLog --- a/ChangeLog Thu May 21 18:24:58 2009 +0100 +++ b/ChangeLog Thu May 21 14:55:51 2009 -0400 @@ -1,3 +1,7 @@ 2009-05-21 Andrew John Hughes + + * .hgignore: Updated. + 2009-05-21 Andrew John Hughes * Makefile.am: From ahughes at redhat.com Thu May 21 12:01:25 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 19:01:25 +0000 Subject: changeset in /hg/icedtea: Merge. Message-ID: changeset d91c81a1cebc in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d91c81a1cebc description: Merge. diffstat: 2 files changed, 24 insertions(+) .hgignore | 20 ++++++++++++++++++++ ChangeLog | 4 ++++ diffs (55 lines): diff -r c2f4a7906024 -r d91c81a1cebc .hgignore --- a/.hgignore Thu May 21 20:02:36 2009 +0100 +++ b/.hgignore Thu May 21 20:03:37 2009 +0100 @@ -3,6 +3,7 @@ syntax: glob syntax: regexp configure +missing aclocal.m4 autom4te.cache cacao @@ -461,6 +462,20 @@ rt/netscape/javascript/JSProxy.java rt/netscape/javascript/JSProxy.java rt/netscape/javascript/JSRunnable.java rt/netscape/javascript/JSUtil.java +rt/com/sun/net/httpserver/Authenticator.java +rt/com/sun/net/httpserver/BasicAuthenticator.java +rt/com/sun/net/httpserver/Filter.java +rt/com/sun/net/httpserver/Headers.java +rt/com/sun/net/httpserver/HttpContext.java +rt/com/sun/net/httpserver/HttpExchange.java +rt/com/sun/net/httpserver/HttpHandler.java +rt/com/sun/net/httpserver/HttpPrincipal.java +rt/com/sun/net/httpserver/HttpServer.java +rt/com/sun/net/httpserver/HttpsConfigurator.java +rt/com/sun/net/httpserver/HttpsExchange.java +rt/com/sun/net/httpserver/HttpsParameters.java +rt/com/sun/net/httpserver/HttpsServer.java +rt/com/sun/net/httpserver/package-info.java generated/sun/awt/X11/generator/sizer.32.orig pulseaudio/bin pulseaudio/.*\.o @@ -468,3 +483,8 @@ pulseaudio/.*jar pulseaudio/.*jar pulse-java.jar hotspot.tar.gz +corba.tar.gz +jaxp.tar.gz +jaxws.tar.gz +jdk.tar.gz +langtools.tar.gz diff -r c2f4a7906024 -r d91c81a1cebc ChangeLog --- a/ChangeLog Thu May 21 20:02:36 2009 +0100 +++ b/ChangeLog Thu May 21 20:03:37 2009 +0100 @@ -4,6 +4,10 @@ 2009-05-21 Andrew John Hughes + + * .hgignore: Updated. 2009-05-21 Andrew John Hughes From ahughes at redhat.com Thu May 21 12:01:25 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 19:01:25 +0000 Subject: changeset in /hg/icedtea: Add missing generated files. Message-ID: changeset c2f4a7906024 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c2f4a7906024 description: Add missing generated files. 2009-05-21 Andrew John Hughes * generated/java/nio/channels/AlreadyBoundException.java, * generated/sun/awt/X11/generator/sizer.64.c, * generated/sun/awt/X11/generator/sizes.64: Added missing generated files. diffstat: 4 files changed, 2305 insertions(+) ChangeLog | 7 generated/java/nio/channels/AlreadyBoundException.java | 51 generated/sun/awt/X11/generator/sizer.64.c | 1247 ++++++++++++++++ generated/sun/awt/X11/generator/sizes.64 | 1000 ++++++++++++ diffs (truncated from 2326 to 500 lines): diff -r d0ad06682da3 -r c2f4a7906024 ChangeLog --- a/ChangeLog Thu May 21 18:24:58 2009 +0100 +++ b/ChangeLog Thu May 21 20:02:36 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-21 Andrew John Hughes + + * generated/java/nio/channels/AlreadyBoundException.java, + * generated/sun/awt/X11/generator/sizer.64.c, + * generated/sun/awt/X11/generator/sizes.64: + Added missing generated files. + 2009-05-21 Andrew John Hughes * Makefile.am: diff -r d0ad06682da3 -r c2f4a7906024 generated/java/nio/channels/AlreadyBoundException.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/java/nio/channels/AlreadyBoundException.java Thu May 21 20:02:36 2009 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + +// -- This file was mechanically generated: Do not edit! -- // + +package java.nio.channels; + + +/** + * Unchecked exception thrown when an attempt is made to bind the socket a + * network oriented channel that is already bound. + * + * @since 1.7 + */ + +public class AlreadyBoundException + extends IllegalStateException +{ + + private static final long serialVersionUID = 6796072983322737592L; + + /** + * Constructs an instance of this class. + */ + public AlreadyBoundException() { } + +} diff -r d0ad06682da3 -r c2f4a7906024 generated/sun/awt/X11/generator/sizer.64 Binary file generated/sun/awt/X11/generator/sizer.64 has changed diff -r d0ad06682da3 -r c2f4a7906024 generated/sun/awt/X11/generator/sizer.64.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/sun/awt/X11/generator/sizer.64.c Thu May 21 20:02:36 2009 +0100 @@ -0,0 +1,1247 @@ +/* This file is an automatically generated file, please do not edit this file, modify the XlibParser.java file instead !*/ + +#include +#include +#include +#include +#include + +#include +#include +#include "awt_p.h" +#include "color.h" +#include "colordata.h" + +typedef struct + +{ + + unsigned long flags; + + unsigned long functions; + + unsigned long decorations; + + long inputMode; + + unsigned long status; + +} PropMwmHints; + + + +int main(){ +Screen temp0; + +XMapRequestEvent temp1; + +AwtScreenData temp2; + +XIMPreeditCaretCallbackStruct temp3; + +XTimeCoord temp4; + +XkbCompatMapNotifyEvent temp5; + +XWindowChanges temp6; + +XSelectionClearEvent temp7; + +XKeyboardControl temp8; + +XIMStatusDrawCallbackStruct temp9; + +XkbNewKeyboardNotifyEvent temp10; + +XOMCharSetList temp11; + +XOMFontInfo temp12; + +XIMStringConversionCallbackStruct temp13; + +XCirculateEvent temp14; + +XIMHotKeyTrigger temp15; + +XExtData temp16; + +XTextProperty temp17; + +XColor temp18; + +XGraphicsExposeEvent temp19; + +XStandardColormap temp20; + +XPropertyEvent temp21; + +ColorEntry temp22; + +XResizeRequestEvent temp23; + +XFontStruct temp24; + +XNoExposeEvent temp25; + +XErrorEvent temp26; + +XArc temp27; + +XSelectionEvent temp28; + +XVisibilityEvent temp29; + +XFontProp temp30; + +XTextItem16 temp31; + +XIMPreeditDrawCallbackStruct temp32; + +XRectangle temp33; + +XkbControlsNotifyEvent temp34; + +PropMwmHints temp35; + +XConfigureEvent temp36; + +XClientMessageEvent temp37; + +XkbIndicatorNotifyEvent temp38; + +XIconSize temp39; + +XSegment temp40; + +XPoint temp41; + +XkbBellNotifyEvent temp42; + +XIMStringConversionText temp43; + +XPixmapFormatValues temp44; + +XExposeEvent temp45; + +XIMStyles temp46; + +XSizeHints temp47; + +XMappingEvent temp48; + +XClassHint temp49; + +XmbTextItem temp50; + +XkbAccessXNotifyEvent temp51; + +XWindowAttributes temp52; + +XSetWindowAttributes temp53; + +XOMOrientation temp54; + +Visual temp55; + +XGravityEvent temp56; + +XReparentEvent temp57; + +XCirculateRequestEvent temp58; + +XKeyEvent temp59; + +XCharStruct temp60; + +XkbActionMessageEvent temp61; + +XModifierKeymap temp62; + +XTextItem temp63; + +XdbeSwapInfo temp64; + +XImage temp65; + +XChar2b temp66; + +XwcTextItem temp67; + +XUnmapEvent temp68; + +awtImageData temp69; + +XkbExtensionDeviceNotifyEvent temp70; + +XkbStateNotifyEvent temp71; + +XkbMapNotifyEvent temp72; + +XGCValues temp73; + +XFocusChangeEvent temp74; + +XMapEvent temp75; + +XIMHotKeyTriggers temp76; + +XKeyboardState temp77; + +XkbEvent temp78; + +XkbAnyEvent temp79; + +XMotionEvent temp80; + +XIMPreeditStateNotifyCallbackStruct temp81; + +XAnyEvent temp82; + +XIMCallback temp83; + +XVisualInfo temp84; + +XkbNamesNotifyEvent temp85; + +XCreateWindowEvent temp86; + +XIMValuesList temp87; + +XKeymapEvent temp88; + +XButtonEvent temp89; + +XWMHints temp90; + +ScreenFormat temp91; + +XCrossingEvent temp92; + +XConfigureRequestEvent temp93; + +XSelectionRequestEvent temp94; + +XFontSetExtents temp95; + +XExtCodes temp96; + +XHostAddress temp97; + +ColorData temp98; + +XColormapEvent temp99; + +Depth temp100; + +XEvent temp101; + +XDestroyWindowEvent temp102; + +XComposeStatus temp103; + +AwtGraphicsConfigData temp104; + +XIMText temp105; + +printf("long %d\n",(int)sizeof(long)); +printf("int %d\n",(int)sizeof(int)); +printf("short %d\n",(int)sizeof(short)); +printf("ptr %d\n",(int)sizeof(void *)); +printf("Bool %d\n",(int)sizeof(Bool)); +printf("Atom %d\n",(int)sizeof(Atom)); +printf("Window %d\n",(int)sizeof(Window)); +printf("Screen.ext_data %d\n",(int)((unsigned long ) &temp0.ext_data- (unsigned long ) &temp0) ); +printf("Screen.display %d\n",(int)((unsigned long ) &temp0.display- (unsigned long ) &temp0) ); +printf("Screen.root %d\n",(int)((unsigned long ) &temp0.root- (unsigned long ) &temp0) ); +printf("Screen.width %d\n",(int)((unsigned long ) &temp0.width- (unsigned long ) &temp0) ); +printf("Screen.height %d\n",(int)((unsigned long ) &temp0.height- (unsigned long ) &temp0) ); +printf("Screen.mwidth %d\n",(int)((unsigned long ) &temp0.mwidth- (unsigned long ) &temp0) ); +printf("Screen.mheight %d\n",(int)((unsigned long ) &temp0.mheight- (unsigned long ) &temp0) ); +printf("Screen.ndepths %d\n",(int)((unsigned long ) &temp0.ndepths- (unsigned long ) &temp0) ); +printf("Screen.depths %d\n",(int)((unsigned long ) &temp0.depths- (unsigned long ) &temp0) ); +printf("Screen.root_depth %d\n",(int)((unsigned long ) &temp0.root_depth- (unsigned long ) &temp0) ); +printf("Screen.root_visual %d\n",(int)((unsigned long ) &temp0.root_visual- (unsigned long ) &temp0) ); +printf("Screen.default_gc %d\n",(int)((unsigned long ) &temp0.default_gc- (unsigned long ) &temp0) ); +printf("Screen.cmap %d\n",(int)((unsigned long ) &temp0.cmap- (unsigned long ) &temp0) ); +printf("Screen.white_pixel %d\n",(int)((unsigned long ) &temp0.white_pixel- (unsigned long ) &temp0) ); +printf("Screen.black_pixel %d\n",(int)((unsigned long ) &temp0.black_pixel- (unsigned long ) &temp0) ); +printf("Screen.max_maps %d\n",(int)((unsigned long ) &temp0.max_maps- (unsigned long ) &temp0) ); +printf("Screen.min_maps %d\n",(int)((unsigned long ) &temp0.min_maps- (unsigned long ) &temp0) ); +printf("Screen.backing_store %d\n",(int)((unsigned long ) &temp0.backing_store- (unsigned long ) &temp0) ); +printf("Screen.save_unders %d\n",(int)((unsigned long ) &temp0.save_unders- (unsigned long ) &temp0) ); +printf("Screen.root_input_mask %d\n",(int)((unsigned long ) &temp0.root_input_mask- (unsigned long ) &temp0) ); +printf("Screen %d\n",(int)sizeof(temp0)); +printf("XMapRequestEvent.type %d\n",(int)((unsigned long ) &temp1.type- (unsigned long ) &temp1) ); +printf("XMapRequestEvent.serial %d\n",(int)((unsigned long ) &temp1.serial- (unsigned long ) &temp1) ); +printf("XMapRequestEvent.send_event %d\n",(int)((unsigned long ) &temp1.send_event- (unsigned long ) &temp1) ); +printf("XMapRequestEvent.display %d\n",(int)((unsigned long ) &temp1.display- (unsigned long ) &temp1) ); +printf("XMapRequestEvent.parent %d\n",(int)((unsigned long ) &temp1.parent- (unsigned long ) &temp1) ); +printf("XMapRequestEvent.window %d\n",(int)((unsigned long ) &temp1.window- (unsigned long ) &temp1) ); +printf("XMapRequestEvent %d\n",(int)sizeof(temp1)); +printf("AwtScreenData.numConfigs %d\n",(int)((unsigned long ) &temp2.numConfigs- (unsigned long ) &temp2) ); +printf("AwtScreenData.root %d\n",(int)((unsigned long ) &temp2.root- (unsigned long ) &temp2) ); +printf("AwtScreenData.whitepixel %d\n",(int)((unsigned long ) &temp2.whitepixel- (unsigned long ) &temp2) ); +printf("AwtScreenData.blackpixel %d\n",(int)((unsigned long ) &temp2.blackpixel- (unsigned long ) &temp2) ); +printf("AwtScreenData.defaultConfig %d\n",(int)((unsigned long ) &temp2.defaultConfig- (unsigned long ) &temp2) ); +printf("AwtScreenData.configs %d\n",(int)((unsigned long ) &temp2.configs- (unsigned long ) &temp2) ); +printf("AwtScreenData %d\n",(int)sizeof(temp2)); +printf("XIMPreeditCaretCallbackStruct.position %d\n",(int)((unsigned long ) &temp3.position- (unsigned long ) &temp3) ); +printf("XIMPreeditCaretCallbackStruct.direction %d\n",(int)((unsigned long ) &temp3.direction- (unsigned long ) &temp3) ); +printf("XIMPreeditCaretCallbackStruct.style %d\n",(int)((unsigned long ) &temp3.style- (unsigned long ) &temp3) ); +printf("XIMPreeditCaretCallbackStruct %d\n",(int)sizeof(temp3)); +printf("XTimeCoord.time %d\n",(int)((unsigned long ) &temp4.time- (unsigned long ) &temp4) ); +printf("XTimeCoord.x %d\n",(int)((unsigned long ) &temp4.x- (unsigned long ) &temp4) ); +printf("XTimeCoord.y %d\n",(int)((unsigned long ) &temp4.y- (unsigned long ) &temp4) ); +printf("XTimeCoord %d\n",(int)sizeof(temp4)); +printf("XkbCompatMapNotifyEvent.type %d\n",(int)((unsigned long ) &temp5.type- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.serial %d\n",(int)((unsigned long ) &temp5.serial- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.send_event %d\n",(int)((unsigned long ) &temp5.send_event- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.display %d\n",(int)((unsigned long ) &temp5.display- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.time %d\n",(int)((unsigned long ) &temp5.time- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.xkb_type %d\n",(int)((unsigned long ) &temp5.xkb_type- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.device %d\n",(int)((unsigned long ) &temp5.device- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.changed_groups %d\n",(int)((unsigned long ) &temp5.changed_groups- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.first_si %d\n",(int)((unsigned long ) &temp5.first_si- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.num_si %d\n",(int)((unsigned long ) &temp5.num_si- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent.num_total_si %d\n",(int)((unsigned long ) &temp5.num_total_si- (unsigned long ) &temp5) ); +printf("XkbCompatMapNotifyEvent %d\n",(int)sizeof(temp5)); +printf("XWindowChanges.x %d\n",(int)((unsigned long ) &temp6.x- (unsigned long ) &temp6) ); +printf("XWindowChanges.y %d\n",(int)((unsigned long ) &temp6.y- (unsigned long ) &temp6) ); +printf("XWindowChanges.width %d\n",(int)((unsigned long ) &temp6.width- (unsigned long ) &temp6) ); +printf("XWindowChanges.height %d\n",(int)((unsigned long ) &temp6.height- (unsigned long ) &temp6) ); +printf("XWindowChanges.border_width %d\n",(int)((unsigned long ) &temp6.border_width- (unsigned long ) &temp6) ); +printf("XWindowChanges.sibling %d\n",(int)((unsigned long ) &temp6.sibling- (unsigned long ) &temp6) ); +printf("XWindowChanges.stack_mode %d\n",(int)((unsigned long ) &temp6.stack_mode- (unsigned long ) &temp6) ); +printf("XWindowChanges %d\n",(int)sizeof(temp6)); +printf("XSelectionClearEvent.type %d\n",(int)((unsigned long ) &temp7.type- (unsigned long ) &temp7) ); +printf("XSelectionClearEvent.serial %d\n",(int)((unsigned long ) &temp7.serial- (unsigned long ) &temp7) ); +printf("XSelectionClearEvent.send_event %d\n",(int)((unsigned long ) &temp7.send_event- (unsigned long ) &temp7) ); +printf("XSelectionClearEvent.display %d\n",(int)((unsigned long ) &temp7.display- (unsigned long ) &temp7) ); +printf("XSelectionClearEvent.window %d\n",(int)((unsigned long ) &temp7.window- (unsigned long ) &temp7) ); +printf("XSelectionClearEvent.selection %d\n",(int)((unsigned long ) &temp7.selection- (unsigned long ) &temp7) ); +printf("XSelectionClearEvent.time %d\n",(int)((unsigned long ) &temp7.time- (unsigned long ) &temp7) ); +printf("XSelectionClearEvent %d\n",(int)sizeof(temp7)); +printf("XKeyboardControl.key_click_percent %d\n",(int)((unsigned long ) &temp8.key_click_percent- (unsigned long ) &temp8) ); +printf("XKeyboardControl.bell_percent %d\n",(int)((unsigned long ) &temp8.bell_percent- (unsigned long ) &temp8) ); +printf("XKeyboardControl.bell_pitch %d\n",(int)((unsigned long ) &temp8.bell_pitch- (unsigned long ) &temp8) ); +printf("XKeyboardControl.bell_duration %d\n",(int)((unsigned long ) &temp8.bell_duration- (unsigned long ) &temp8) ); +printf("XKeyboardControl.led %d\n",(int)((unsigned long ) &temp8.led- (unsigned long ) &temp8) ); +printf("XKeyboardControl.led_mode %d\n",(int)((unsigned long ) &temp8.led_mode- (unsigned long ) &temp8) ); +printf("XKeyboardControl.key %d\n",(int)((unsigned long ) &temp8.key- (unsigned long ) &temp8) ); +printf("XKeyboardControl.auto_repeat_mode %d\n",(int)((unsigned long ) &temp8.auto_repeat_mode- (unsigned long ) &temp8) ); +printf("XKeyboardControl %d\n",(int)sizeof(temp8)); +printf("XIMStatusDrawCallbackStruct.type %d\n",(int)((unsigned long ) &temp9.type- (unsigned long ) &temp9) ); +printf("XIMStatusDrawCallbackStruct.data %d\n",(int)((unsigned long ) &temp9.data- (unsigned long ) &temp9) ); +printf("XIMStatusDrawCallbackStruct %d\n",(int)sizeof(temp9)); +printf("XkbNewKeyboardNotifyEvent.type %d\n",(int)((unsigned long ) &temp10.type- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.serial %d\n",(int)((unsigned long ) &temp10.serial- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.send_event %d\n",(int)((unsigned long ) &temp10.send_event- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.display %d\n",(int)((unsigned long ) &temp10.display- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.time %d\n",(int)((unsigned long ) &temp10.time- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.xkb_type %d\n",(int)((unsigned long ) &temp10.xkb_type- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.device %d\n",(int)((unsigned long ) &temp10.device- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.old_device %d\n",(int)((unsigned long ) &temp10.old_device- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.min_key_code %d\n",(int)((unsigned long ) &temp10.min_key_code- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.max_key_code %d\n",(int)((unsigned long ) &temp10.max_key_code- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.old_min_key_code %d\n",(int)((unsigned long ) &temp10.old_min_key_code- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.old_max_key_code %d\n",(int)((unsigned long ) &temp10.old_max_key_code- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.changed %d\n",(int)((unsigned long ) &temp10.changed- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.req_major %d\n",(int)((unsigned long ) &temp10.req_major- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent.req_minor %d\n",(int)((unsigned long ) &temp10.req_minor- (unsigned long ) &temp10) ); +printf("XkbNewKeyboardNotifyEvent %d\n",(int)sizeof(temp10)); +printf("XOMCharSetList.charset_count %d\n",(int)((unsigned long ) &temp11.charset_count- (unsigned long ) &temp11) ); +printf("XOMCharSetList.charset_list %d\n",(int)((unsigned long ) &temp11.charset_list- (unsigned long ) &temp11) ); +printf("XOMCharSetList %d\n",(int)sizeof(temp11)); +printf("XOMFontInfo.num_font %d\n",(int)((unsigned long ) &temp12.num_font- (unsigned long ) &temp12) ); +printf("XOMFontInfo.font_struct_list %d\n",(int)((unsigned long ) &temp12.font_struct_list- (unsigned long ) &temp12) ); +printf("XOMFontInfo.font_name_list %d\n",(int)((unsigned long ) &temp12.font_name_list- (unsigned long ) &temp12) ); +printf("XOMFontInfo %d\n",(int)sizeof(temp12)); +printf("XIMStringConversionCallbackStruct.position %d\n",(int)((unsigned long ) &temp13.position- (unsigned long ) &temp13) ); +printf("XIMStringConversionCallbackStruct.direction %d\n",(int)((unsigned long ) &temp13.direction- (unsigned long ) &temp13) ); +printf("XIMStringConversionCallbackStruct.operation %d\n",(int)((unsigned long ) &temp13.operation- (unsigned long ) &temp13) ); +printf("XIMStringConversionCallbackStruct.factor %d\n",(int)((unsigned long ) &temp13.factor- (unsigned long ) &temp13) ); +printf("XIMStringConversionCallbackStruct.text %d\n",(int)((unsigned long ) &temp13.text- (unsigned long ) &temp13) ); +printf("XIMStringConversionCallbackStruct %d\n",(int)sizeof(temp13)); +printf("XCirculateEvent.type %d\n",(int)((unsigned long ) &temp14.type- (unsigned long ) &temp14) ); +printf("XCirculateEvent.serial %d\n",(int)((unsigned long ) &temp14.serial- (unsigned long ) &temp14) ); +printf("XCirculateEvent.send_event %d\n",(int)((unsigned long ) &temp14.send_event- (unsigned long ) &temp14) ); +printf("XCirculateEvent.display %d\n",(int)((unsigned long ) &temp14.display- (unsigned long ) &temp14) ); +printf("XCirculateEvent.event %d\n",(int)((unsigned long ) &temp14.event- (unsigned long ) &temp14) ); +printf("XCirculateEvent.window %d\n",(int)((unsigned long ) &temp14.window- (unsigned long ) &temp14) ); +printf("XCirculateEvent.place %d\n",(int)((unsigned long ) &temp14.place- (unsigned long ) &temp14) ); +printf("XCirculateEvent %d\n",(int)sizeof(temp14)); +printf("XIMHotKeyTrigger.keysym %d\n",(int)((unsigned long ) &temp15.keysym- (unsigned long ) &temp15) ); +printf("XIMHotKeyTrigger.modifier %d\n",(int)((unsigned long ) &temp15.modifier- (unsigned long ) &temp15) ); +printf("XIMHotKeyTrigger.modifier_mask %d\n",(int)((unsigned long ) &temp15.modifier_mask- (unsigned long ) &temp15) ); +printf("XIMHotKeyTrigger %d\n",(int)sizeof(temp15)); +printf("XExtData.number %d\n",(int)((unsigned long ) &temp16.number- (unsigned long ) &temp16) ); +printf("XExtData.next %d\n",(int)((unsigned long ) &temp16.next- (unsigned long ) &temp16) ); +printf("XExtData.free_private %d\n",(int)((unsigned long ) &temp16.free_private- (unsigned long ) &temp16) ); +printf("XExtData.private_data %d\n",(int)((unsigned long ) &temp16.private_data- (unsigned long ) &temp16) ); +printf("XExtData %d\n",(int)sizeof(temp16)); +printf("XTextProperty.value %d\n",(int)((unsigned long ) &temp17.value- (unsigned long ) &temp17) ); +printf("XTextProperty.encoding %d\n",(int)((unsigned long ) &temp17.encoding- (unsigned long ) &temp17) ); +printf("XTextProperty.format %d\n",(int)((unsigned long ) &temp17.format- (unsigned long ) &temp17) ); +printf("XTextProperty.nitems %d\n",(int)((unsigned long ) &temp17.nitems- (unsigned long ) &temp17) ); +printf("XTextProperty %d\n",(int)sizeof(temp17)); +printf("XColor.pixel %d\n",(int)((unsigned long ) &temp18.pixel- (unsigned long ) &temp18) ); +printf("XColor.red %d\n",(int)((unsigned long ) &temp18.red- (unsigned long ) &temp18) ); +printf("XColor.green %d\n",(int)((unsigned long ) &temp18.green- (unsigned long ) &temp18) ); +printf("XColor.blue %d\n",(int)((unsigned long ) &temp18.blue- (unsigned long ) &temp18) ); +printf("XColor.flags %d\n",(int)((unsigned long ) &temp18.flags- (unsigned long ) &temp18) ); +printf("XColor.pad %d\n",(int)((unsigned long ) &temp18.pad- (unsigned long ) &temp18) ); +printf("XColor %d\n",(int)sizeof(temp18)); +printf("XGraphicsExposeEvent.type %d\n",(int)((unsigned long ) &temp19.type- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.serial %d\n",(int)((unsigned long ) &temp19.serial- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.send_event %d\n",(int)((unsigned long ) &temp19.send_event- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.display %d\n",(int)((unsigned long ) &temp19.display- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.drawable %d\n",(int)((unsigned long ) &temp19.drawable- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.x %d\n",(int)((unsigned long ) &temp19.x- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.y %d\n",(int)((unsigned long ) &temp19.y- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.width %d\n",(int)((unsigned long ) &temp19.width- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.height %d\n",(int)((unsigned long ) &temp19.height- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.count %d\n",(int)((unsigned long ) &temp19.count- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.major_code %d\n",(int)((unsigned long ) &temp19.major_code- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent.minor_code %d\n",(int)((unsigned long ) &temp19.minor_code- (unsigned long ) &temp19) ); +printf("XGraphicsExposeEvent %d\n",(int)sizeof(temp19)); +printf("XStandardColormap.colormap %d\n",(int)((unsigned long ) &temp20.colormap- (unsigned long ) &temp20) ); +printf("XStandardColormap.red_max %d\n",(int)((unsigned long ) &temp20.red_max- (unsigned long ) &temp20) ); +printf("XStandardColormap.red_mult %d\n",(int)((unsigned long ) &temp20.red_mult- (unsigned long ) &temp20) ); +printf("XStandardColormap.green_max %d\n",(int)((unsigned long ) &temp20.green_max- (unsigned long ) &temp20) ); +printf("XStandardColormap.green_mult %d\n",(int)((unsigned long ) &temp20.green_mult- (unsigned long ) &temp20) ); +printf("XStandardColormap.blue_max %d\n",(int)((unsigned long ) &temp20.blue_max- (unsigned long ) &temp20) ); +printf("XStandardColormap.blue_mult %d\n",(int)((unsigned long ) &temp20.blue_mult- (unsigned long ) &temp20) ); +printf("XStandardColormap.base_pixel %d\n",(int)((unsigned long ) &temp20.base_pixel- (unsigned long ) &temp20) ); +printf("XStandardColormap.visualid %d\n",(int)((unsigned long ) &temp20.visualid- (unsigned long ) &temp20) ); +printf("XStandardColormap.killid %d\n",(int)((unsigned long ) &temp20.killid- (unsigned long ) &temp20) ); +printf("XStandardColormap %d\n",(int)sizeof(temp20)); +printf("XPropertyEvent.type %d\n",(int)((unsigned long ) &temp21.type- (unsigned long ) &temp21) ); +printf("XPropertyEvent.serial %d\n",(int)((unsigned long ) &temp21.serial- (unsigned long ) &temp21) ); +printf("XPropertyEvent.send_event %d\n",(int)((unsigned long ) &temp21.send_event- (unsigned long ) &temp21) ); +printf("XPropertyEvent.display %d\n",(int)((unsigned long ) &temp21.display- (unsigned long ) &temp21) ); +printf("XPropertyEvent.window %d\n",(int)((unsigned long ) &temp21.window- (unsigned long ) &temp21) ); +printf("XPropertyEvent.atom %d\n",(int)((unsigned long ) &temp21.atom- (unsigned long ) &temp21) ); +printf("XPropertyEvent.time %d\n",(int)((unsigned long ) &temp21.time- (unsigned long ) &temp21) ); +printf("XPropertyEvent.state %d\n",(int)((unsigned long ) &temp21.state- (unsigned long ) &temp21) ); From ahughes at redhat.com Thu May 21 12:08:18 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 21 May 2009 19:08:18 +0000 Subject: changeset in /hg/icedtea: Make directory searches used by --with... Message-ID: changeset 082075fb775e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=082075fb775e description: Make directory searches used by --with-icedtea and --with-openjdk match. 2009-05-21 Andrew John Hughes * acinclude.m4: Search same directories when using --with-openjdk as --with-icedtea. diffstat: 2 files changed, 11 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ acinclude.m4 | 7 +++++-- diffs (37 lines): diff -r d91c81a1cebc -r 082075fb775e ChangeLog --- a/ChangeLog Thu May 21 20:03:37 2009 +0100 +++ b/ChangeLog Thu May 21 20:10:28 2009 +0100 @@ -1,3 +1,9 @@ 2009-05-21 Andrew John Hughes + + * acinclude.m4: + Search same directories when using + --with-openjdk as --with-icedtea. + 2009-05-21 Andrew John Hughes * generated/java/nio/channels/AlreadyBoundException.java, diff -r d91c81a1cebc -r 082075fb775e acinclude.m4 --- a/acinclude.m4 Thu May 21 20:03:37 2009 +0100 +++ b/acinclude.m4 Thu May 21 20:10:28 2009 +0100 @@ -1213,7 +1213,9 @@ AC_DEFUN([AC_CHECK_FOR_OPENJDK], SYSTEM_OPENJDK_DIR= ]) if test -z "${SYSTEM_OPENJDK_DIR}"; then - for dir in /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk ; do + for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \ + /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ + /usr/lib/jvm/openjdk; do if test -d $dir; then SYSTEM_OPENJDK_DIR=$dir break @@ -1250,7 +1252,8 @@ AC_DEFUN([AC_CHECK_FOR_ICEDTEA], ]) if test -z "${SYSTEM_ICEDTEA_DIR}"; then for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \ - /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do + /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ + /usr/lib/jvm/openjdk; do if test -d $dir; then SYSTEM_ICEDTEA_DIR=$dir break From gnu_andrew at member.fsf.org Thu May 21 12:54:49 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 21 May 2009 20:54:49 +0100 Subject: JamVM Message-ID: <17c6771e0905211254l3b4ab298h6e79bc00b7c97bf@mail.gmail.com> FOSDEM 2009 talk now available from the usual place: http://fuseyism.com/#movies -- 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 xerxes at zafena.se Thu May 21 16:10:53 2009 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Fri, 22 May 2009 01:10:53 +0200 Subject: [patch] Re: changeset in /hg/icedtea6: 2009-05-18 Robert Schuster References: Message-ID: <4A15DF7D.9000603@zafena.se> Hi Robert! Great work with getting cross compile support into icedtea! Using your last patches i have been able to cross compile hotspot yet when building openjdk my build failed with the strange error: "arm: No such file or directory error." The root cause of this are that the TARGET_ARCH variable ends up in the tail of the LINKER variable used in openjdk Library.gmk LINKER in turn orgin from LINK.c and it is here TARGET_ARCH happened to be used since TARGET_ARCH are part of , LINK.c, one of the built in default rules of make! to see the default rules of make: make -p -l | grep LINK.c LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) The attaches patch renames TARGET_ARCH to CROSS_TARGET_ARCH in order to prevent this unintended use by the built in LINK.c make rule. Cheers Xerxes Den 2009-05-19 13:10, Robert Schuster skrev: > changeset 802bb547f651 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=802bb547f651 > description: > 2009-05-18 Robert Schuster > > * acinclude.m4: Set TARGET_ARCH. > * Makefile.am: Set TARGET_ARCH in IcedTea and IcedTea-ECJ builds > when ENABLE_CROSS_COMPILATION is true. > * patches/icedtea-explicit-target-arch.patch: New patch (SCA in place). > > diffstat: > > 4 files changed, 92 insertions(+), 2 deletions(-) > ChangeLog | 7 ++ > Makefile.am | 7 ++ > acinclude.m4 | 12 ++++ > patches/icedtea-explicit-target-arch.patch | 68 ++++++++++++++++++++++++++++ > > diffs (198 lines): > > diff -r 84a527d1a06c -r 802bb547f651 ChangeLog > --- a/ChangeLog Mon May 18 22:07:21 2009 -0400 > +++ b/ChangeLog Tue May 19 13:11:47 2009 +0200 > @@ -1,3 +1,10 @@ 2009-05-17 Lillian Angel +2009-05-18 Robert Schuster > + > + * acinclude.m4: Set TARGET_ARCH. > + * Makefile.am: Set TARGET_ARCH in IcedTea and IcedTea-ECJ builds > + when ENABLE_CROSS_COMPILATION is true. > + * patches/icedtea-explicit-target-arch.patch: New patch (SCA in place). > + > 2009-05-17 Lillian Angel > > * configure.ac: Set version back to 1.5. > diff -r 84a527d1a06c -r 802bb547f651 Makefile.am > --- a/Makefile.am Mon May 18 22:07:21 2009 -0400 > +++ b/Makefile.am Tue May 19 13:11:47 2009 +0200 > @@ -201,7 +201,8 @@ endif > > if ENABLE_CROSS_COMPILATION > ICEDTEA_ENV += \ > - "CROSS_COMPILATION=true" > + "CROSS_COMPILATION=true" \ > + "TARGET_ARCH=$(TARGET_ARCH)" > endif > > if USE_ALT_JAR > @@ -283,7 +284,8 @@ endif > > if ENABLE_CROSS_COMPILATION > ICEDTEA_ENV_ECJ += \ > - "CROSS_COMPILATION=true" > + "CROSS_COMPILATION=true" \ > + "TARGET_ARCH=$(TARGET_ARCH)" > endif > > env-ecj: > @@ -661,6 +663,7 @@ ICEDTEA_PATCHES += \ > patches/icedtea-java2d-stroker-internal-joint.patch \ > patches/icedtea-java2d-stroker-internal-close-joint.patch \ > patches/icedtea-disable-cc-incompatible-sanity-checks.patch \ > + patches/icedtea-explicit-target-arch.patch \ > $(DISTRIBUTION_PATCHES) > > stamps/extract.stamp: stamps/download.stamp > diff -r 84a527d1a06c -r 802bb547f651 acinclude.m4 > --- a/acinclude.m4 Mon May 18 22:07:21 2009 -0400 > +++ b/acinclude.m4 Tue May 19 13:11:47 2009 +0200 > @@ -5,65 +5,77 @@ AC_DEFUN([SET_ARCH_DIRS], > BUILD_ARCH_DIR=amd64 > INSTALL_ARCH_DIR=amd64 > JRE_ARCH_DIR=amd64 > + TARGET_ARCH=x86_64 > ;; > i?86-*-*) > BUILD_ARCH_DIR=i586 > INSTALL_ARCH_DIR=i386 > JRE_ARCH_DIR=i386 > ARCH_PREFIX=${LINUX32} > + TARGET_ARCH=i386 > ;; > alpha*-*-*) > BUILD_ARCH_DIR=alpha > INSTALL_ARCH_DIR=alpha > JRE_ARCH_DIR=alpha > + TARGET_ARCH=alpha > ;; > arm*-*-*) > BUILD_ARCH_DIR=arm > INSTALL_ARCH_DIR=arm > JRE_ARCH_DIR=arm > + TARGET_ARCH=arm > ;; > mips-*-*) > BUILD_ARCH_DIR=mips > INSTALL_ARCH_DIR=mips > JRE_ARCH_DIR=mips > + TARGET_ARCH=mips > ;; > mipsel-*-*) > BUILD_ARCH_DIR=mipsel > INSTALL_ARCH_DIR=mipsel > JRE_ARCH_DIR=mipsel > + TARGET_ARCH=mipsel > ;; > powerpc-*-*) > BUILD_ARCH_DIR=ppc > INSTALL_ARCH_DIR=ppc > JRE_ARCH_DIR=ppc > ARCH_PREFIX=${LINUX32} > + TARGET_ARCH=ppc > ;; > powerpc64-*-*) > BUILD_ARCH_DIR=ppc64 > INSTALL_ARCH_DIR=ppc64 > JRE_ARCH_DIR=ppc64 > + TARGET_ARCH=ppc64 > ;; > sparc64-*-*) > BUILD_ARCH_DIR=sparcv9 > INSTALL_ARCH_DIR=sparcv9 > JRE_ARCH_DIR=sparc64 > + TARGET_ARCH=sparc64 > ;; > s390-*-*) > BUILD_ARCH_DIR=s390 > INSTALL_ARCH_DIR=s390 > JRE_ARCH_DIR=s390 > ARCH_PREFIX=${LINUX32} > + TARGET_ARCH=s390 > ;; > *) > BUILD_ARCH_DIR=`uname -m` > INSTALL_ARCH_DIR=$BUILD_ARCH_DIR > JRE_ARCH_DIR=$INSTALL_ARCH_DIR > + TARGET_ARCH=$BUILD_ARCH_DIR > ;; > esac > AC_SUBST(BUILD_ARCH_DIR) > AC_SUBST(INSTALL_ARCH_DIR) > AC_SUBST(JRE_ARCH_DIR) > AC_SUBST(ARCH_PREFIX) > + AC_SUBST(TARGET_ARCH) > ]) > > AC_DEFUN([SET_OS_DIRS], > diff -r 84a527d1a06c -r 802bb547f651 patches/icedtea-explicit-target-arch.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/icedtea-explicit-target-arch.patch Tue May 19 13:11:47 2009 +0200 > @@ -0,0 +1,68 @@ > +Index: openjdk/hotspot/make/linux/makefiles/defs.make > +=================================================================== > +--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2009-05-18 14:09:57.812930043 +0200 > ++++ openjdk/hotspot/make/linux/makefiles/defs.make 2009-05-18 14:30:46.318871170 +0200 > +@@ -1,4 +1,4 @@ > +-# > ++ > + # Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved. > + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > + # > +@@ -29,7 +29,11 @@ > + SLASH_JAVA ?= /java > + > + # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name > +-ARCH:=$(shell uname -m) > ++ifndef CROSS_COMPILATION > ++ ARCH:=$(shell uname -m) > ++else > ++ ARCH:=$(TARGET_ARCH) > ++endif > + PATH_SEP = : > + ifeq ($(LP64), 1) > + ARCH_DATA_MODEL ?= 64 > +Index: openjdk/jdk/make/common/shared/Platform.gmk > +=================================================================== > +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2009-05-18 14:09:57.950854863 +0200 > ++++ openjdk/jdk/make/common/shared/Platform.gmk 2009-05-18 14:18:59.387528133 +0200 > +@@ -190,9 +190,13 @@ > + OS_NAME = linux > + OS_VERSION := $(shell uname -r) > + # Arch and OS name/version > +- mach := $(shell uname -m) > +- ifneq (,$(wildcard /usr/bin/dpkg-architecture)) > +- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') > ++ ifndef CROSS_COMPILATION > ++ mach := $(shell uname -m) > ++ ifneq (,$(wildcard /usr/bin/dpkg-architecture)) > ++ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') > ++ endif > ++ else > ++ mach := $(TARGET_ARCH) > + endif > + archExpr = case "$(mach)" in \ > + i[3-9]86) \ > +Index: openjdk/corba/make/common/shared/Platform.gmk > +=================================================================== > +--- openjdk.orig/corba/make/common/shared/Platform.gmk 2009-05-18 14:09:58.044921758 +0200 > ++++ openjdk/corba/make/common/shared/Platform.gmk 2009-05-18 14:17:30.760805124 +0200 > +@@ -179,10 +179,15 @@ > + PLATFORM = linux > + OS_NAME = linux > + OS_VERSION := $(shell uname -r) > +- # Arch and OS name/version > +- mach := $(shell uname -m) > +- ifneq (,$(wildcard /usr/bin/dpkg-architecture)) > +- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') > ++ ifndef CROSS_COMPILATION > ++ # Not cross-compiling. Take architecture from running system. > ++ mach := $(shell uname -m) > ++ ifneq (,$(wildcard /usr/bin/dpkg-architecture)) > ++ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') > ++ endif > ++ else > ++ # Cross-compilation: Assume target archicture is given. > ++ mach := $(TARGET_ARCH) > + endif > + archExpr = case "$(mach)" in \ > + i[3-9]86) \ > -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: cross-target-arch.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090522/3cff4d25/cross-target-arch.patch From ahughes at redhat.com Thu May 21 17:10:02 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 22 May 2009 00:10:02 +0000 Subject: changeset in /hg/icedtea: Fix build of Zero VM. Message-ID: changeset 6124157d5bdb in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6124157d5bdb description: Fix build of Zero VM. 2009-05-21 Andrew John Hughes * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: (delayed_value_impl(intptr_t,Register,int)): Add stub. * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: (delayed_value_impl(intptr_t,Register,int)): Declared. * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Handle Interpreter::method_handle. * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp: (delayed_value_impl(intptr_t,Register,int)): Add stub. * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp: (generate_method_handle_entry()): Declared. * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: (generate_method_handle_entry()): Add stub. * ports/hotspot/src/cpu/zero/vm/jni_zero.h: Define jlong depending on whether _LP64 is defined, as with format specifier in globalDefinitions. * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp: Empty class required by invokedynamic support. * ports/hotspot/src/cpu/zero/vm/register_zero.hpp: Declare noreg. * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Use INTPTR_FORMAT instead of %d for pointers to compile on 64-bit platforms. * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp: Define HeapBaseMinAddress as 2G (copied from x86_64). diffstat: 12 files changed, 87 insertions(+), 3 deletions(-) ChangeLog | 27 ++++++++++ ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 6 ++ ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 2 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 4 + ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp | 3 + ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 1 ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 5 + ports/hotspot/src/cpu/zero/vm/jni_zero.h | 7 ++ ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp | 27 ++++++++++ ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 2 ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 4 - ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 2 diffs (195 lines): diff -r 082075fb775e -r 6124157d5bdb ChangeLog --- a/ChangeLog Thu May 21 20:10:28 2009 +0100 +++ b/ChangeLog Fri May 22 01:12:07 2009 +0100 @@ -1,3 +1,30 @@ 2009-05-21 Andrew John Hughes + + * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: + (delayed_value_impl(intptr_t,Register,int)): Add stub. + * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: + (delayed_value_impl(intptr_t,Register,int)): Declared. + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: + Handle Interpreter::method_handle. + * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp: + (delayed_value_impl(intptr_t,Register,int)): Add stub. + * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp: + (generate_method_handle_entry()): Declared. + * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: + (generate_method_handle_entry()): Add stub. + * ports/hotspot/src/cpu/zero/vm/jni_zero.h: + Define jlong depending on whether _LP64 is defined, + as with format specifier in globalDefinitions. + * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp: + Empty class required by invokedynamic support. + * ports/hotspot/src/cpu/zero/vm/register_zero.hpp: + Declare noreg. + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: + Use INTPTR_FORMAT instead of %d for pointers to compile on 64-bit + platforms. + * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp: + Define HeapBaseMinAddress as 2G (copied from x86_64). + 2009-05-21 Andrew John Hughes * acinclude.m4: diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp --- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Fri May 22 01:12:07 2009 +0100 @@ -60,6 +60,12 @@ void MacroAssembler::advance(int bytes) sync(); } +RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr, + Register tmpl, int offset) +{ + Unimplemented(); +} + static void _UnimplementedStub() { report_unimplemented(__FILE__, __LINE__); diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Fri May 22 01:12:07 2009 +0100 @@ -45,6 +45,8 @@ class MacroAssembler : public Assembler void align(int modulus); void bang_stack_with_offset(int offset); bool needs_explicit_null_check(intptr_t offset); + RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, + Register tmp, int offset); public: void advance(int bytes); }; diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp --- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Fri May 22 01:12:07 2009 +0100 @@ -751,6 +751,10 @@ address AbstractInterpreterGenerator::ge entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry(); break; + case Interpreter::method_handle: + entry_point = ((InterpreterGenerator*)this)->generate_method_handle_entry(); + break; + case Interpreter::java_lang_math_sin: case Interpreter::java_lang_math_cos: case Interpreter::java_lang_math_tan: diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp Fri May 22 01:12:07 2009 +0100 @@ -28,4 +28,7 @@ class InterpreterMacroAssembler : public class InterpreterMacroAssembler : public MacroAssembler { public: InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {} + RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, Register tmp, int offset) { + Unimplemented(); + } }; diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp Fri May 22 01:12:07 2009 +0100 @@ -35,3 +35,4 @@ address generate_math_entry(AbstractInterpreter::MethodKind kind); address generate_empty_entry(); address generate_accessor_entry(); + address generate_method_handle_entry(); diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp --- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Fri May 22 01:12:07 2009 +0100 @@ -46,6 +46,11 @@ address InterpreterGenerator::generate_a return UnimplementedEntry(); } +address InterpreterGenerator::generate_method_handle_entry() +{ + return UnimplementedEntry(); +} + int AbstractInterpreter::size_activation(methodOop method, int tempcount, int popframe_extra_args, diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/jni_zero.h --- a/ports/hotspot/src/cpu/zero/vm/jni_zero.h Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/jni_zero.h Fri May 22 01:12:07 2009 +0100 @@ -28,5 +28,10 @@ #define JNICALL typedef int jint; +typedef signed char jbyte; + +#ifdef _LP64 +typedef long jlong; +#else typedef long long jlong; -typedef signed char jbyte; +#endif diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp Fri May 22 01:12:07 2009 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2009 Red Hat, Inc. + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + +#include "incls/_precompiled.incl" +#include "incls/_methodHandles_zero.cpp.incl" diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/register_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/register_zero.hpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/register_zero.hpp Fri May 22 01:12:07 2009 +0100 @@ -112,3 +112,5 @@ class ConcreteRegisterImpl : public Abst static const int max_gpr; static const int max_fpr; }; + +CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1)); diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Fri May 22 01:12:07 2009 +0100 @@ -181,7 +181,7 @@ class ZeroStackPrinter { } } else { - snprintf(_buf, _buflen, "%s[%d]", + snprintf(_buf, _buflen, "%s[" INTPTR_FORMAT "]", top_frame ? "stack_word" : "local", istate->stack_base() - addr - 1); field = _buf; @@ -230,7 +230,7 @@ class ZeroStackPrinter { } } else { - snprintf(_buf, _buflen, "%s[%d]", + snprintf(_buf, _buflen, "%s[" INTPTR_FORMAT "]", top_frame ? "stack_word" : "local", stack_base - addr - 1); field = _buf; diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp --- a/ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp Thu May 21 20:10:28 2009 +0100 +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp Fri May 22 01:12:07 2009 +0100 @@ -41,3 +41,5 @@ define_pd_global(uintx, JVMInvokeMethodS define_pd_global(uintx, JVMInvokeMethodSlack, 8192); define_pd_global(bool, UseVectoredExceptions, false); +// Only used on 64 bit platforms +define_pd_global(uintx, HeapBaseMinAddress, 2*G); From gbenson at redhat.com Fri May 22 01:00:57 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 22 May 2009 09:00:57 +0100 Subject: changeset in /hg/icedtea: Fix build of Zero VM. In-Reply-To: References: Message-ID: <20090522080057.GA3182@redhat.com> Nice, thank you :) Cheers, Gary Andrew John Hughes wrote: > changeset 6124157d5bdb in /hg/icedtea > details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6124157d5bdb > description: > Fix build of Zero VM. > > 2009-05-21 Andrew John Hughes > > * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: > (delayed_value_impl(intptr_t,Register,int)): Add stub. > * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: > (delayed_value_impl(intptr_t,Register,int)): Declared. > * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: > Handle Interpreter::method_handle. > * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp: > (delayed_value_impl(intptr_t,Register,int)): Add stub. > * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp: > (generate_method_handle_entry()): Declared. > * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: > (generate_method_handle_entry()): Add stub. > * ports/hotspot/src/cpu/zero/vm/jni_zero.h: > Define jlong depending on whether _LP64 is defined, > as with format specifier in globalDefinitions. > * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp: > Empty class required by invokedynamic support. > * ports/hotspot/src/cpu/zero/vm/register_zero.hpp: > Declare noreg. > * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: > Use INTPTR_FORMAT instead of %d for pointers to compile on 64-bit > platforms. > * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp: > Define HeapBaseMinAddress as 2G (copied from x86_64). > > diffstat: > > 12 files changed, 87 insertions(+), 3 deletions(-) > ChangeLog | 27 ++++++++++ > ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 6 ++ > ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 2 > ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 4 + > ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp | 3 + > ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 1 > ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 5 + > ports/hotspot/src/cpu/zero/vm/jni_zero.h | 7 ++ > ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp | 27 ++++++++++ > ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 2 > ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 4 - > ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 2 > > diffs (195 lines): > > diff -r 082075fb775e -r 6124157d5bdb ChangeLog > --- a/ChangeLog Thu May 21 20:10:28 2009 +0100 > +++ b/ChangeLog Fri May 22 01:12:07 2009 +0100 > @@ -1,3 +1,30 @@ 2009-05-21 Andrew John Hughes +2009-05-21 Andrew John Hughes > + > + * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: > + (delayed_value_impl(intptr_t,Register,int)): Add stub. > + * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: > + (delayed_value_impl(intptr_t,Register,int)): Declared. > + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: > + Handle Interpreter::method_handle. > + * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp: > + (delayed_value_impl(intptr_t,Register,int)): Add stub. > + * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp: > + (generate_method_handle_entry()): Declared. > + * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: > + (generate_method_handle_entry()): Add stub. > + * ports/hotspot/src/cpu/zero/vm/jni_zero.h: > + Define jlong depending on whether _LP64 is defined, > + as with format specifier in globalDefinitions. > + * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp: > + Empty class required by invokedynamic support. > + * ports/hotspot/src/cpu/zero/vm/register_zero.hpp: > + Declare noreg. > + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: > + Use INTPTR_FORMAT instead of %d for pointers to compile on 64-bit > + platforms. > + * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp: > + Define HeapBaseMinAddress as 2G (copied from x86_64). > + > 2009-05-21 Andrew John Hughes > > * acinclude.m4: > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp > --- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Fri May 22 01:12:07 2009 +0100 > @@ -60,6 +60,12 @@ void MacroAssembler::advance(int bytes) > sync(); > } > > +RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr, > + Register tmpl, int offset) > +{ > + Unimplemented(); > +} > + > static void _UnimplementedStub() > { > report_unimplemented(__FILE__, __LINE__); > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp > --- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Fri May 22 01:12:07 2009 +0100 > @@ -45,6 +45,8 @@ class MacroAssembler : public Assembler > void align(int modulus); > void bang_stack_with_offset(int offset); > bool needs_explicit_null_check(intptr_t offset); > + RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, > + Register tmp, int offset); > public: > void advance(int bytes); > }; > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp > --- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Fri May 22 01:12:07 2009 +0100 > @@ -751,6 +751,10 @@ address AbstractInterpreterGenerator::ge > entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry(); > break; > > + case Interpreter::method_handle: > + entry_point = ((InterpreterGenerator*)this)->generate_method_handle_entry(); > + break; > + > case Interpreter::java_lang_math_sin: > case Interpreter::java_lang_math_cos: > case Interpreter::java_lang_math_tan: > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp > --- a/ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp Fri May 22 01:12:07 2009 +0100 > @@ -28,4 +28,7 @@ class InterpreterMacroAssembler : public > class InterpreterMacroAssembler : public MacroAssembler { > public: > InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {} > + RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, Register tmp, int offset) { > + Unimplemented(); > + } > }; > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp > --- a/ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp Fri May 22 01:12:07 2009 +0100 > @@ -35,3 +35,4 @@ > address generate_math_entry(AbstractInterpreter::MethodKind kind); > address generate_empty_entry(); > address generate_accessor_entry(); > + address generate_method_handle_entry(); > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp > --- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Fri May 22 01:12:07 2009 +0100 > @@ -46,6 +46,11 @@ address InterpreterGenerator::generate_a > return UnimplementedEntry(); > } > > +address InterpreterGenerator::generate_method_handle_entry() > +{ > + return UnimplementedEntry(); > +} > + > int AbstractInterpreter::size_activation(methodOop method, > int tempcount, > int popframe_extra_args, > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/jni_zero.h > --- a/ports/hotspot/src/cpu/zero/vm/jni_zero.h Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/jni_zero.h Fri May 22 01:12:07 2009 +0100 > @@ -28,5 +28,10 @@ > #define JNICALL > > typedef int jint; > +typedef signed char jbyte; > + > +#ifdef _LP64 > +typedef long jlong; > +#else > typedef long long jlong; > -typedef signed char jbyte; > +#endif > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp Fri May 22 01:12:07 2009 +0100 > @@ -0,0 +1,27 @@ > +/* > + * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. > + * Copyright 2009 Red Hat, Inc. > + * 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. > + * > + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, > + * CA 95054 USA or visit www.sun.com if you need additional information or > + * have any questions. > + * > + */ > + > +#include "incls/_precompiled.incl" > +#include "incls/_methodHandles_zero.cpp.incl" > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/register_zero.hpp > --- a/ports/hotspot/src/cpu/zero/vm/register_zero.hpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/register_zero.hpp Fri May 22 01:12:07 2009 +0100 > @@ -112,3 +112,5 @@ class ConcreteRegisterImpl : public Abst > static const int max_gpr; > static const int max_fpr; > }; > + > +CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1)); > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp > --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Fri May 22 01:12:07 2009 +0100 > @@ -181,7 +181,7 @@ class ZeroStackPrinter { > } > } > else { > - snprintf(_buf, _buflen, "%s[%d]", > + snprintf(_buf, _buflen, "%s[" INTPTR_FORMAT "]", > top_frame ? "stack_word" : "local", > istate->stack_base() - addr - 1); > field = _buf; > @@ -230,7 +230,7 @@ class ZeroStackPrinter { > } > } > else { > - snprintf(_buf, _buflen, "%s[%d]", > + snprintf(_buf, _buflen, "%s[" INTPTR_FORMAT "]", > top_frame ? "stack_word" : "local", > stack_base - addr - 1); > field = _buf; > diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp > --- a/ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp Thu May 21 20:10:28 2009 +0100 > +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp Fri May 22 01:12:07 2009 +0100 > @@ -41,3 +41,5 @@ define_pd_global(uintx, JVMInvokeMethodS > define_pd_global(uintx, JVMInvokeMethodSlack, 8192); > > define_pd_global(bool, UseVectoredExceptions, false); > +// Only used on 64 bit platforms > +define_pd_global(uintx, HeapBaseMinAddress, 2*G); > > -- http://gbenson.net/ From gbenson at redhat.com Fri May 22 06:55:49 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 22 May 2009 13:55:49 +0000 Subject: changeset in /hg/icedtea6: 2009-05-22 Gary Benson changeset f0c97fcc519f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f0c97fcc519f description: 2009-05-22 Gary Benson * patches/icedtea-zero.patch (vmError.cpp): Don't include interpreterRuntime.hpp here. * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Include interpreterRuntime.hpp and scopeDesc.hpp. (ZeroStackPrinter::print_word): Decode pc to get bci. diffstat: 3 files changed, 25 insertions(+), 4 deletions(-) ChangeLog | 8 ++++++++ patches/icedtea-zero.patch | 5 ++--- ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 16 +++++++++++++++- diffs (76 lines): diff -r 12f2a25cb831 -r f0c97fcc519f ChangeLog --- a/ChangeLog Thu May 21 14:26:47 2009 +0100 +++ b/ChangeLog Fri May 22 14:56:54 2009 +0100 @@ -1,3 +1,11 @@ 2009-05-21 Gary Benson + + * patches/icedtea-zero.patch + (vmError.cpp): Don't include interpreterRuntime.hpp here. + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp + Include interpreterRuntime.hpp and scopeDesc.hpp. + (ZeroStackPrinter::print_word): Decode pc to get bci. + 2009-05-21 Gary Benson * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: diff -r 12f2a25cb831 -r f0c97fcc519f patches/icedtea-zero.patch --- a/patches/icedtea-zero.patch Thu May 21 14:26:47 2009 +0100 +++ b/patches/icedtea-zero.patch Fri May 22 14:56:54 2009 +0100 @@ -162,14 +162,13 @@ --- openjdk/hotspot/src/share/vm/utilities/vmError.cpp.orig 2008-07-27 08:37:02.000000000 +0000 +++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-07-27 08:38:13.000000000 +0000 -@@ -25,6 +25,11 @@ +@@ -25,6 +25,10 @@ # include "incls/_precompiled.incl" # include "incls/_vmError.cpp.incl" +# ifdef ZERO -+# include +# include -+# endif // ++# endif // ZERO + // List of environment variables that should be reported in error log file. const char *env_list[] = { diff -r 12f2a25cb831 -r f0c97fcc519f ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Thu May 21 14:26:47 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Fri May 22 14:56:54 2009 +0100 @@ -22,6 +22,9 @@ * have any questions. * */ + +#include +#include class ZeroStackPrinter { private: @@ -190,15 +193,26 @@ class ZeroStackPrinter { } } if (frame->is_shark_frame()) { + SharkFrame *sf = frame->as_shark_frame(); + methodOop method = sf->method(); + if (word == SharkFrame::pc_off) { field = "pc"; + if (method->is_oop()) { + nmethod *code = method->code(); + address pc = sf->pc(); + if (code->pc_desc_at(pc)) { + SimpleScopeDesc ssd(code, pc); + snprintf(_buf, _buflen, PTR_FORMAT " (bci %d)", pc, ssd.bci()); + value = _buf; + } + } } else if (word == SharkFrame::unextended_sp_off) { field = "unextended_sp"; } else if (word == SharkFrame::method_off) { field = "method"; - methodOop method = ((SharkFrame *) frame)->method(); if (method->is_oop()) value = method->name_and_sig_as_C_string(_buf, _buflen); } From gbenson at redhat.com Fri May 22 07:01:13 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 22 May 2009 15:01:13 +0100 Subject: [PATCH] Add bci to Shark frames in crash dumps Message-ID: <20090522140113.GA14260@redhat.com> Hi all, My last commit makes Zero's stack printer decode Shark frames' bcis in crash dumps. A typical frame looks like this: 0x7f88370d27b8: local[2] = 0x00007f8846074df8 0x7f88370d27c0: local[1] = 0x00007f8842e4bb70 0x7f88370d27c8: local[0] = 0x00007f8846074ba0 0x7f88370d27d0: monitor[0]->_lock = 0x0000000000000001 0x7f88370d27d8: monitor[0]->_obj = 0x00007f8846074c00 0x7f88370d27e0: oop_tmp = 0x00007f88370d2768 0x7f88370d27e8: method = java.awt.EventDispatchThread.pumpOneEventForFilters(I)Z 0x7f88370d27f0: unextended_sp = 0x00007f88370d27a8 0x7f88370d27f8: pc = 0x00007f887078401b (bci 186) 0x7f88370d2800: frame_type = SHARK_FRAME 0x7f88370d2808: next_frame = 0x00007f88370d28e0 Pretty useful huh? Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r 12f2a25cb831 -r f0c97fcc519f ChangeLog --- a/ChangeLog Thu May 21 14:26:47 2009 +0100 +++ b/ChangeLog Fri May 22 14:56:54 2009 +0100 @@ -1,3 +1,11 @@ +2009-05-22 Gary Benson + + * patches/icedtea-zero.patch + (vmError.cpp): Don't include interpreterRuntime.hpp here. + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp + Include interpreterRuntime.hpp and scopeDesc.hpp. + (ZeroStackPrinter::print_word): Decode pc to get bci. + 2009-05-21 Gary Benson * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: diff -r 12f2a25cb831 -r f0c97fcc519f patches/icedtea-zero.patch --- a/patches/icedtea-zero.patch Thu May 21 14:26:47 2009 +0100 +++ b/patches/icedtea-zero.patch Fri May 22 14:56:54 2009 +0100 @@ -162,14 +162,13 @@ --- openjdk/hotspot/src/share/vm/utilities/vmError.cpp.orig 2008-07-27 08:37:02.000000000 +0000 +++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-07-27 08:38:13.000000000 +0000 -@@ -25,6 +25,11 @@ +@@ -25,6 +25,10 @@ # include "incls/_precompiled.incl" # include "incls/_vmError.cpp.incl" +# ifdef ZERO -+# include +# include -+# endif // ++# endif // ZERO + // List of environment variables that should be reported in error log file. const char *env_list[] = { diff -r 12f2a25cb831 -r f0c97fcc519f ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Thu May 21 14:26:47 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Fri May 22 14:56:54 2009 +0100 @@ -23,6 +23,9 @@ * */ +#include +#include + class ZeroStackPrinter { private: outputStream* _st; @@ -190,15 +193,26 @@ } } if (frame->is_shark_frame()) { + SharkFrame *sf = frame->as_shark_frame(); + methodOop method = sf->method(); + if (word == SharkFrame::pc_off) { field = "pc"; + if (method->is_oop()) { + nmethod *code = method->code(); + address pc = sf->pc(); + if (code->pc_desc_at(pc)) { + SimpleScopeDesc ssd(code, pc); + snprintf(_buf, _buflen, PTR_FORMAT " (bci %d)", pc, ssd.bci()); + value = _buf; + } + } } else if (word == SharkFrame::unextended_sp_off) { field = "unextended_sp"; } else if (word == SharkFrame::method_off) { field = "method"; - methodOop method = ((SharkFrame *) frame)->method(); if (method->is_oop()) value = method->name_and_sig_as_C_string(_buf, _buflen); } From gbenson at redhat.com Fri May 22 07:17:16 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 22 May 2009 14:17:16 +0000 Subject: changeset in /hg/icedtea6: 2009-05-22 Gary Benson changeset 9b5aa042e9c2 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9b5aa042e9c2 description: 2009-05-22 Gary Benson * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Include interpreterRuntime.hpp and scopeDesc.hpp. (ZeroStackPrinter::print_word): Decode bcx to get bci. diffstat: 2 files changed, 12 insertions(+) ChangeLog | 6 ++++++ ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 6 ++++++ diffs (29 lines): diff -r f0c97fcc519f -r 9b5aa042e9c2 ChangeLog --- a/ChangeLog Fri May 22 14:56:54 2009 +0100 +++ b/ChangeLog Fri May 22 15:18:17 2009 +0100 @@ -1,3 +1,9 @@ 2009-05-22 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp + Include interpreterRuntime.hpp and scopeDesc.hpp. + (ZeroStackPrinter::print_word): Decode bcx to get bci. + 2009-05-22 Gary Benson * patches/icedtea-zero.patch diff -r f0c97fcc519f -r 9b5aa042e9c2 ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Fri May 22 14:56:54 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Fri May 22 15:18:17 2009 +0100 @@ -115,6 +115,12 @@ class ZeroStackPrinter { if (is_valid && !strcmp(field, "_method")) { value = istate->method()->name_and_sig_as_C_string(_buf,_buflen); field = "istate->_method"; + } + else if (is_valid && !strcmp(field, "_bcp") && istate->bcp()) { + snprintf(_buf, _buflen, PTR_FORMAT " (bci %d)", istate->bcp(), + istate->method()->bci_from(istate->bcp())); + value = _buf; + field = "istate->_bcp"; } else { snprintf(_buf, _buflen, "%sistate->%s", From gbenson at redhat.com Fri May 22 07:19:48 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 22 May 2009 15:19:48 +0100 Subject: [PATCH] Add bci to Zero frames in crash dumps too Message-ID: <20090522141948.GB14260@redhat.com> Hi all, Further to my last mail, this commit makes Zero's stack printer decode interpreter frames' bcis in crash dumps too. I'm sure I've written this before, but apparently I didn't commit it... Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r f0c97fcc519f -r 9b5aa042e9c2 ChangeLog --- a/ChangeLog Fri May 22 14:56:54 2009 +0100 +++ b/ChangeLog Fri May 22 15:18:17 2009 +0100 @@ -1,3 +1,9 @@ +2009-05-22 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp + Include interpreterRuntime.hpp and scopeDesc.hpp. + (ZeroStackPrinter::print_word): Decode bcx to get bci. + 2009-05-22 Gary Benson * patches/icedtea-zero.patch diff -r f0c97fcc519f -r 9b5aa042e9c2 ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Fri May 22 14:56:54 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Fri May 22 15:18:17 2009 +0100 @@ -116,6 +116,12 @@ value = istate->method()->name_and_sig_as_C_string(_buf,_buflen); field = "istate->_method"; } + else if (is_valid && !strcmp(field, "_bcp") && istate->bcp()) { + snprintf(_buf, _buflen, PTR_FORMAT " (bci %d)", istate->bcp(), + istate->method()->bci_from(istate->bcp())); + value = _buf; + field = "istate->_bcp"; + } else { snprintf(_buf, _buflen, "%sistate->%s", field[strlen(field) - 1] == ')' ? "(": "", field); From gnu_andrew at member.fsf.org Fri May 22 07:32:02 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 15:32:02 +0100 Subject: changeset in /hg/icedtea: Fix build of Zero VM. In-Reply-To: <20090522080057.GA3182@redhat.com> References: <20090522080057.GA3182@redhat.com> Message-ID: <17c6771e0905220732h15954c98w8beb2dc90ccbcf1e@mail.gmail.com> 2009/5/22 Gary Benson : > Nice, thank you :) > > Cheers, > Gary > Gary, Does this look ok for 6? It would be nice to keep the two in sync, especially if we're going to try and push it upstream (this is needed to build with current HotSpot) and I don't see anything that would break the build on 6, just stubs that are superfluous on hs14. Cheers, -- Andy :) > Andrew John Hughes wrote: >> changeset 6124157d5bdb in /hg/icedtea >> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6124157d5bdb >> description: >> ? ? ? Fix build of Zero VM. >> >> ? ? ? 2009-05-21 ?Andrew John Hughes ? >> >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: >> ? ? ? ? ? ? ? (delayed_value_impl(intptr_t,Register,int)): Add stub. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: >> ? ? ? ? ? ? ? (delayed_value_impl(intptr_t,Register,int)): Declared. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: >> ? ? ? ? ? ? ? Handle Interpreter::method_handle. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp: >> ? ? ? ? ? ? ? (delayed_value_impl(intptr_t,Register,int)): Add stub. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp: >> ? ? ? ? ? ? ? (generate_method_handle_entry()): Declared. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: >> ? ? ? ? ? ? ? (generate_method_handle_entry()): Add stub. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/jni_zero.h: >> ? ? ? ? ? ? ? Define jlong depending on whether _LP64 is defined, >> ? ? ? ? ? ? ? as with format specifier in globalDefinitions. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp: >> ? ? ? ? ? ? ? Empty class required by invokedynamic support. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/register_zero.hpp: >> ? ? ? ? ? ? ? Declare noreg. >> ? ? ? ? ? ? ? * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: >> ? ? ? ? ? ? ? Use INTPTR_FORMAT instead of %d for pointers to compile on 64-bit >> ? ? ? ? ? ? ? platforms. >> ? ? ? ? ? ? ? * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp: >> ? ? ? ? ? ? ? Define HeapBaseMinAddress as 2G (copied from x86_64). >> >> diffstat: >> >> 12 files changed, 87 insertions(+), 3 deletions(-) >> ChangeLog ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? | ? 27 ++++++++++ >> ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp ? ? ? ? ? ? ?| ? ?6 ++ >> ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp ? ? ? ? ? ? ?| ? ?2 >> ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp ? ? ? ? | ? ?4 + >> ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp ? ? ? ? ? ?| ? ?3 + >> ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp ? | ? ?1 >> ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp ? ? ? ? ? ?| ? ?5 + >> ports/hotspot/src/cpu/zero/vm/jni_zero.h ? ? ? ? ? ? ? ? ? ? ?| ? ?7 ++ >> ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp ? ? ? ? ?| ? 27 ++++++++++ >> ports/hotspot/src/cpu/zero/vm/register_zero.hpp ? ? ? ? ? ? ? | ? ?2 >> ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp ? ? ? ? ? | ? ?4 - >> ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | ? ?2 >> >> diffs (195 lines): >> >> diff -r 082075fb775e -r 6124157d5bdb ChangeLog >> --- a/ChangeLog ? ? ? Thu May 21 20:10:28 2009 +0100 >> +++ b/ChangeLog ? ? ? Fri May 22 01:12:07 2009 +0100 >> @@ -1,3 +1,30 @@ 2009-05-21 ?Andrew John Hughes ?> +2009-05-21 ?Andrew John Hughes ? >> + >> + ? ? * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: >> + ? ? (delayed_value_impl(intptr_t,Register,int)): Add stub. >> + ? ? * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: >> + ? ? (delayed_value_impl(intptr_t,Register,int)): Declared. >> + ? ? * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: >> + ? ? Handle Interpreter::method_handle. >> + ? ? * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp: >> + ? ? (delayed_value_impl(intptr_t,Register,int)): Add stub. >> + ? ? * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp: >> + ? ? (generate_method_handle_entry()): Declared. >> + ? ? * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: >> + ? ? (generate_method_handle_entry()): Add stub. >> + ? ? * ports/hotspot/src/cpu/zero/vm/jni_zero.h: >> + ? ? Define jlong depending on whether _LP64 is defined, >> + ? ? as with format specifier in globalDefinitions. >> + ? ? * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp: >> + ? ? Empty class required by invokedynamic support. >> + ? ? * ports/hotspot/src/cpu/zero/vm/register_zero.hpp: >> + ? ? Declare noreg. >> + ? ? * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: >> + ? ? Use INTPTR_FORMAT instead of %d for pointers to compile on 64-bit >> + ? ? platforms. >> + ? ? * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp: >> + ? ? Define HeapBaseMinAddress as 2G (copied from x86_64). >> + >> ?2009-05-21 ?Andrew John Hughes ? >> >> ? ? ? * acinclude.m4: >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp >> --- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp ? ? ? ?Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp ? ? ? ?Fri May 22 01:12:07 2009 +0100 >> @@ -60,6 +60,12 @@ void MacroAssembler::advance(int bytes) >> ? ?sync(); >> ?} >> >> +RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr, >> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? Register tmpl, int offset) >> +{ >> + ?Unimplemented(); >> +} >> + >> ?static void _UnimplementedStub() >> ?{ >> ? ?report_unimplemented(__FILE__, __LINE__); >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp >> --- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp ? ? ? ?Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp ? ? ? ?Fri May 22 01:12:07 2009 +0100 >> @@ -45,6 +45,8 @@ class MacroAssembler : public Assembler >> ? ?void align(int modulus); >> ? ?void bang_stack_with_offset(int offset); >> ? ?bool needs_explicit_null_check(intptr_t offset); >> + ?RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, >> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? Register tmp, int offset); >> ? public: >> ? ?void advance(int bytes); >> ?}; >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp >> --- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp ? Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp ? Fri May 22 01:12:07 2009 +0100 >> @@ -751,6 +751,10 @@ address AbstractInterpreterGenerator::ge >> ? ? ?entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry(); >> ? ? ?break; >> >> + ?case Interpreter::method_handle: >> + ? ?entry_point = ((InterpreterGenerator*)this)->generate_method_handle_entry(); >> + ? ?break; >> + >> ? ?case Interpreter::java_lang_math_sin: >> ? ?case Interpreter::java_lang_math_cos: >> ? ?case Interpreter::java_lang_math_tan: >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp >> --- a/ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp ? ? ?Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp ? ? ?Fri May 22 01:12:07 2009 +0100 >> @@ -28,4 +28,7 @@ class InterpreterMacroAssembler : public >> ?class InterpreterMacroAssembler : public MacroAssembler { >> ? public: >> ? ?InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {} >> + ?RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, Register tmp, int offset) { >> + ? ?Unimplemented(); >> + ?} >> ?}; >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp >> --- a/ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp ? ? Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp ? ? Fri May 22 01:12:07 2009 +0100 >> @@ -35,3 +35,4 @@ >> ? ?address generate_math_entry(AbstractInterpreter::MethodKind kind); >> ? ?address generate_empty_entry(); >> ? ?address generate_accessor_entry(); >> + ?address generate_method_handle_entry(); >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp >> --- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp ? ? ?Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp ? ? ?Fri May 22 01:12:07 2009 +0100 >> @@ -46,6 +46,11 @@ address InterpreterGenerator::generate_a >> ? ?return UnimplementedEntry(); >> ?} >> >> +address InterpreterGenerator::generate_method_handle_entry() >> +{ >> + ?return UnimplementedEntry(); >> +} >> + >> ?int AbstractInterpreter::size_activation(methodOop method, >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int tempcount, >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int popframe_extra_args, >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/jni_zero.h >> --- a/ports/hotspot/src/cpu/zero/vm/jni_zero.h ? ? ? ?Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/jni_zero.h ? ? ? ?Fri May 22 01:12:07 2009 +0100 >> @@ -28,5 +28,10 @@ >> ?#define JNICALL >> >> ?typedef int jint; >> +typedef signed char jbyte; >> + >> +#ifdef _LP64 >> +typedef long jlong; >> +#else >> ?typedef long long jlong; >> -typedef signed char jbyte; >> +#endif >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp ? ?Fri May 22 01:12:07 2009 +0100 >> @@ -0,0 +1,27 @@ >> +/* >> + * Copyright 1997-2009 Sun Microsystems, Inc. ?All Rights Reserved. >> + * Copyright 2009 Red Hat, Inc. >> + * 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. >> + * >> + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, >> + * CA 95054 USA or visit www.sun.com if you need additional information or >> + * have any questions. >> + * >> + */ >> + >> +#include "incls/_precompiled.incl" >> +#include "incls/_methodHandles_zero.cpp.incl" >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/register_zero.hpp >> --- a/ports/hotspot/src/cpu/zero/vm/register_zero.hpp Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/register_zero.hpp Fri May 22 01:12:07 2009 +0100 >> @@ -112,3 +112,5 @@ class ConcreteRegisterImpl : public Abst >> ? ?static const int max_gpr; >> ? ?static const int max_fpr; >> ?}; >> + >> +CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1)); >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp >> --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp ? ? Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp ? ? Fri May 22 01:12:07 2009 +0100 >> @@ -181,7 +181,7 @@ class ZeroStackPrinter { >> ? ? ? ? ? ? ? ?} >> ? ? ? ? ? ? ?} >> ? ? ? ? ? ? ?else { >> - ? ? ? ? ? ? ?snprintf(_buf, _buflen, "%s[%d]", >> + ? ? ? ? ? ? ?snprintf(_buf, _buflen, "%s[" INTPTR_FORMAT "]", >> ? ? ? ? ? ? ? ? ? ? ? ? top_frame ? "stack_word" : "local", >> ? ? ? ? ? ? ? ? ? ? ? ? istate->stack_base() - addr - 1); >> ? ? ? ? ? ? ? ?field = _buf; >> @@ -230,7 +230,7 @@ class ZeroStackPrinter { >> ? ? ? ? ? ? ?} >> ? ? ? ? ? ?} >> ? ? ? ? ? ?else { >> - ? ? ? ? ? ?snprintf(_buf, _buflen, "%s[%d]", >> + ? ? ? ? ? ?snprintf(_buf, _buflen, "%s[" INTPTR_FORMAT "]", >> ? ? ? ? ? ? ? ? ? ? ? top_frame ? "stack_word" : "local", >> ? ? ? ? ? ? ? ? ? ? ? stack_base - addr - 1); >> ? ? ? ? ? ? ?field = _buf; >> diff -r 082075fb775e -r 6124157d5bdb ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp >> --- a/ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp ? Thu May 21 20:10:28 2009 +0100 >> +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp ? Fri May 22 01:12:07 2009 +0100 >> @@ -41,3 +41,5 @@ define_pd_global(uintx, JVMInvokeMethodS >> ?define_pd_global(uintx, JVMInvokeMethodSlack, ? ?8192); >> >> ?define_pd_global(bool, ?UseVectoredExceptions, ? false); >> +// Only used on 64 bit platforms >> +define_pd_global(uintx, HeapBaseMinAddress, ? ? ?2*G); >> >> > > -- > http://gbenson.net/ > -- 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 omajid at redhat.com Fri May 22 07:45:11 2009 From: omajid at redhat.com (Omair Majid) Date: Fri, 22 May 2009 14:45:11 +0000 Subject: changeset in /hg/icedtea6: 2009-05-22 Omair Majid changeset fd613af504b2 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fd613af504b2 description: 2009-05-22 Omair Majid * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to reflect that the element can be either 'java' or 'j2se'. * rt/net/sourceforge/jnlp/JREDesc.java: Fix comment to reflect a 'java' element. New private variable vmArgs to keep track of 'java-vm-args'. (JREDesc): Modify to take in an additional parameter vmArgs and store it in vmArgs. (getVMArgs): New function. Return the value of 'java-vm-args' attribute. * rt/net/sourceforge/jnlp/Parser.java: Fix comments to reflect either a 'java' or 'j2se' element. (getResourceDesc): Treat 'java' element identically to 'j2se' element. (getJRE): Read in the value of the 'java-vm-args' attribute. diffstat: 4 files changed, 36 insertions(+), 8 deletions(-) ChangeLog | 14 ++++++++++++++ rt/net/sourceforge/jnlp/JNLPFile.java | 2 +- rt/net/sourceforge/jnlp/JREDesc.java | 17 +++++++++++++++-- rt/net/sourceforge/jnlp/Parser.java | 11 ++++++----- diffs (137 lines): diff -r 9b5aa042e9c2 -r fd613af504b2 ChangeLog --- a/ChangeLog Fri May 22 15:18:17 2009 +0100 +++ b/ChangeLog Fri May 22 10:13:16 2009 -0400 @@ -1,3 +1,17 @@ 2009-05-22 Gary Benson + + * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to reflect + that the element can be either 'java' or 'j2se'. + * rt/net/sourceforge/jnlp/JREDesc.java: Fix comment to reflect a 'java' + element. New private variable vmArgs to keep track of 'java-vm-args'. + (JREDesc): Modify to take in an additional parameter vmArgs and store it in + vmArgs. + (getVMArgs): New function. Return the value of 'java-vm-args' attribute. + * rt/net/sourceforge/jnlp/Parser.java: Fix comments to reflect either a + 'java' or 'j2se' element. + (getResourceDesc): Treat 'java' element identically to 'j2se' element. + (getJRE): Read in the value of the 'java-vm-args' attribute. + 2009-05-22 Gary Benson * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp diff -r 9b5aa042e9c2 -r fd613af504b2 rt/net/sourceforge/jnlp/JNLPFile.java --- a/rt/net/sourceforge/jnlp/JNLPFile.java Fri May 22 15:18:17 2009 +0100 +++ b/rt/net/sourceforge/jnlp/JNLPFile.java Fri May 22 10:13:16 2009 -0400 @@ -505,7 +505,7 @@ public class JNLPFile { sourceLocation = parser.getFileLocation(); info = parser.getInfo(root); - resources = parser.getResources(root, false); // false == not a j2se resources section + resources = parser.getResources(root, false); // false == not a j2se/java resources section launchType = parser.getLauncher(root); security = parser.getSecurity(root); } diff -r 9b5aa042e9c2 -r fd613af504b2 rt/net/sourceforge/jnlp/JREDesc.java --- a/rt/net/sourceforge/jnlp/JREDesc.java Fri May 22 15:18:17 2009 +0100 +++ b/rt/net/sourceforge/jnlp/JREDesc.java Fri May 22 10:13:16 2009 -0400 @@ -22,7 +22,7 @@ import java.util.*; import java.util.*; /** - * The J2SE element. + * The J2SE/Java element. * * @author Jon A. Maxwell (JAM) - initial author * @version $Revision: 1.5 $ @@ -41,6 +41,9 @@ public class JREDesc { /** maximum head size */ private long maximumHeapSize; + /** args to pass to the vm */ + private String vmArgs; + /** list of ResourceDesc objects */ private List resources; @@ -55,9 +58,12 @@ public class JREDesc { * @param maximumHeadSize maximum head size * @param resources list of ResourceDesc objects */ - public JREDesc(Version version, URL location, String initialHeapSize, String maximumHeapSize, List resources) { + public JREDesc(Version version, URL location, + String vmArgs, String initialHeapSize, + String maximumHeapSize, List resources) { this.version = version; this.location = location; + this.vmArgs = vmArgs; this.initialHeapSize = heapToLong(initialHeapSize); this.maximumHeapSize = heapToLong(maximumHeapSize); this.resources = resources; @@ -110,6 +116,13 @@ public class JREDesc { } /** + * Returns the additional arguments to pass to the Java VM + */ + public String getVMArgs() { + return vmArgs; + } + + /** * Convert a heap size description string to a long value * indicating the heap min/max size. */ diff -r 9b5aa042e9c2 -r fd613af504b2 rt/net/sourceforge/jnlp/Parser.java --- a/rt/net/sourceforge/jnlp/Parser.java Fri May 22 15:18:17 2009 +0100 +++ b/rt/net/sourceforge/jnlp/Parser.java Fri May 22 10:13:16 2009 -0400 @@ -186,7 +186,7 @@ class Parser { * node (jnlp or j2se). * * @param parent the parent node (either jnlp or j2se) - * @param j2se true if the resources are located under a j2se node + * @param j2se true if the resources are located under a j2se or java node * @throws ParseException if the JNLP file is invalid */ public List getResources(Node parent, boolean j2se) throws ParseException { @@ -208,7 +208,7 @@ class Parser { * Returns the ResourcesDesc element at the specified node. * * @param node the resources node - * @param j2se true if the resources are located under a j2se node + * @param j2se true if the resources are located under a j2se or java node * @throws ParseException if the JNLP file is invalid */ public ResourcesDesc getResourcesDesc(Node node, boolean j2se) throws ParseException { @@ -231,7 +231,7 @@ class Parser { if (!isTrustedEnvironment()) throw new ParseException(R("PUntrustedNative")); - if ("j2se".equals(name)) { + if ("j2se".equals(name) || "java".equals(name)) { if (getChildNode(root, "component-desc") != null) if (strict) throw new ParseException(R("PExtensionHasJ2SE")); @@ -273,12 +273,13 @@ class Parser { /** * Returns the JRE element at the specified node. * - * @param node the j2se node + * @param node the j2se/java node * @throws ParseException if the JNLP file is invalid */ public JREDesc getJRE(Node node) throws ParseException { Version version = getVersion(node, "version", null); URL location = getURL(node, "href", base); + String vmArgs = getAttribute(node, "java-vm-args",null); String initialHeap = getAttribute(node, "initial-heap-size", null); String maxHeap = getAttribute(node, "max-heap-size", null); List resources = getResources(node, true); @@ -286,7 +287,7 @@ class Parser { // require version attribute getRequiredAttribute(node, "version", null); - return new JREDesc(version, location, initialHeap, maxHeap, resources); + return new JREDesc(version, location, vmArgs, initialHeap, maxHeap, resources); } /** From gbenson at redhat.com Fri May 22 07:51:44 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 22 May 2009 15:51:44 +0100 Subject: changeset in /hg/icedtea: Fix build of Zero VM. In-Reply-To: <17c6771e0905220732h15954c98w8beb2dc90ccbcf1e@mail.gmail.com> References: <20090522080057.GA3182@redhat.com> <17c6771e0905220732h15954c98w8beb2dc90ccbcf1e@mail.gmail.com> Message-ID: <20090522145144.GC14260@redhat.com> Andrew John Hughes wrote: > Does this look ok for 6? It would be nice to keep the two in sync, > especially if we're going to try and push it upstream (this is > needed to build with current HotSpot) and I don't see anything that > would break the build on 6, just stubs that are superfluous on hs14. I was meaning to ask you about that. Yes, commit away :) Cheers, Gary -- http://gbenson.net/ From mark at klomp.org Fri May 22 07:57:44 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 22 May 2009 16:57:44 +0200 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> Message-ID: <1243004264.3655.99.camel@hermans.wildebeest.org> Hi, On Wed, 2009-05-20 at 21:34 +0100, Andrew John Hughes wrote: > Current status: > > * Everything is now synced from IcedTea6 (except Gervill, which mjw > wanted to look at). I resynced it with Gervill cvs upstream to have the same baseline implementation as icedtea6: 2009-05-22 Mark Wielaard * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*, overlays/openjdk/jdk/test/com/sun/media/sound/*: Import Gervill fixes from CVS. See CHANGES.txt: 6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz. 6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge. 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 - Fix: Notes get stuck on when we overflow the synthesizer with rapid note on /off messages. JTreg test has been created: test/com/sun/media/sound/SoftChannel/NoteOverFlowTest - Fix: Portamento controller reset to wrong value in SoftChannel.resetAllControllers. This caused incorrect glider effect in some midi files. For example in TuningApplet1 in TET-7 keyboard, when note was pressed for first time a glider effect could be heard. - Fix: Delay modulation calculation in SoftChorus.LFODelay where incorrect. - Fix: Removed unnecessary volatile keywords in SoftChorus. * fsg.sh: Don't remove (non-existing) com/sun/media/sound services. * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services: removed. Cheers, Mark From mark at klomp.org Fri May 22 07:58:47 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 22 May 2009 14:58:47 +0000 Subject: changeset in /hg/icedtea: Import Gervill fixes from CVS. See CHA... Message-ID: changeset b443c3bc7e25 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b443c3bc7e25 description: Import Gervill fixes from CVS. See CHANGES.txt: 6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz. 6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge. 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 - Fix: Notes get stuck on when we overflow the synthesizer with rapid note on /off messages. JTreg test has been created: test/com/sun/media/sound/SoftChannel/NoteOverFlowTest - Fix: Portamento controller reset to wrong value in SoftChannel.resetAllControllers. This caused incorrect glider effect in some midi files. For example in TuningApplet1 in TET-7 keyboard, when note was pressed for first time a glider effect could be heard. - Fix: Delay modulation calculation in SoftChorus.LFODelay where incorrect. - Fix: Removed unnecessary volatile keywords in SoftChorus. * fsg.sh: Don't remove (non-existing) com/sun/media/sound services. * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services: removed. diffstat: 35 files changed, 622 insertions(+), 469 deletions(-) ChangeLog | 29 + fsg.sh | 7 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 13 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 46 +- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java | 30 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java | 32 -- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 10 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider | 5 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader | 5 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider | 5 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider | 3 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider | 6 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java | 42 +- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java | 64 ++-- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java | 158 +++++----- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java | 46 +- overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java | 24 - overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java | 42 +- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java | 64 ++-- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java | 158 +++++----- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java | 46 +- overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java | 55 ++- overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Interpolate.java | 2 overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java | 2 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java | 106 ++++++ overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java | 55 ++- diffs (truncated from 1638 to 500 lines): diff -r 6124157d5bdb -r b443c3bc7e25 ChangeLog --- a/ChangeLog Fri May 22 01:12:07 2009 +0100 +++ b/ChangeLog Fri May 22 16:55:42 2009 +0200 @@ -1,3 +1,32 @@ 2009-05-21 Andrew John Hughes + + * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*, + overlays/openjdk/jdk/test/com/sun/media/sound/*: + Import Gervill fixes from CVS. See CHANGES.txt: + + 6823446: Gervill SoftLowFrequencyOscillator fails when freq is + set to 0 cent or 8.1758 Hz. + 6823445: Gervill SoftChannel/ResetAllControllers jtreg test + fails after portamento fix from last merge. + 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 + + - Fix: Notes get stuck on when we overflow the synthesizer + with rapid note on /off messages. + JTreg test has been created: + test/com/sun/media/sound/SoftChannel/NoteOverFlowTest + - Fix: Portamento controller reset to wrong value in + SoftChannel.resetAllControllers. + This caused incorrect glider effect in some midi files. + For example in TuningApplet1 in TET-7 keyboard, + when note was pressed for first time a glider effect could be + heard. + - Fix: Delay modulation calculation in SoftChorus.LFODelay where + incorrect. + - Fix: Removed unnecessary volatile keywords in SoftChorus. + * fsg.sh: Don't remove (non-existing) com/sun/media/sound services. + * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services: + removed. + 2009-05-21 Andrew John Hughes * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: diff -r 6124157d5bdb -r b443c3bc7e25 fsg.sh --- a/fsg.sh Fri May 22 01:12:07 2009 +0100 +++ b/fsg.sh Fri May 22 16:55:42 2009 +0200 @@ -102,12 +102,5 @@ rm -rf openjdk/jdk/src/share/classes/com rm -rf openjdk/jdk/src/share/classes/com/sun/jmx/snmp rm -rf openjdk/jdk/test/com/sun/jmx/snmp -# Remove support for proprietary sound -rm -rf openjdk/jdk/src/share/classes/com/sun/media/sound/services -rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/MixerSynthProvider.java -rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/RmfFileReader.java -rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/HsbParser.java -rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInputDeviceProvider.java - # Remove registration tests rm -rf openjdk/jdk/test/com/sun/servicetag diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Fri May 22 16:55:42 2009 +0200 @@ -1,3 +1,16 @@ +6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz. +6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge. +6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 + + - Fix: Notes get stuck on when we overflow the synthesizer with rapid note on/off messages. + JTreg test has been created: + test/com/sun/media/sound/SoftChannel/NoteOverFlowTest + - Fix: Portamento controller reset to wrong value in SoftChannel.resetAllControllers. + This caused incorrect glider effect in some midi files. + For example in TuningApplet1 in TET-7 keyboard, + when note was pressed for first time a glider effect could be heard. + - Fix: Delay modulation calculation in SoftChorus.LFODelay where incorrect. + - Fix: Removed unnecessary volatile keywords in SoftChorus. - Fix: Throw IllegalArgumentException Exception on invalid soundbank to: SoftSynthesizer.unloadAllInstruments(Soundbank soundbank) diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Fri May 22 16:55:42 2009 +0200 @@ -1,27 +1,27 @@ /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * 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. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ + * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ package com.sun.media.sound; diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Fri May 22 16:55:42 2009 +0200 @@ -93,7 +93,6 @@ public class SoftChannel implements Midi protected double portamento_time = 1; // keyschanges per control buffer time protected int[] portamento_lastnote = new int[128]; protected int portamento_lastnote_ix = 0; - private int portamento_control_note = -1; private boolean portamento = false; private boolean mono = false; private boolean mute = false; @@ -369,12 +368,12 @@ public class SoftChannel implements Midi voice.setSoloMute(solomute); if (releaseTriggered) return; - if (portamento_control_note != -1) { + if (controller[84] != 0) { voice.co_noteon_keynumber[0] - = (tuning.getTuning(portamento_control_note) / 100.0) + = (tuning.getTuning(controller[84]) / 100.0) * (1f / 128f); voice.portamento = true; - portamento_control_note = -1; + controlChange(84, 0); } else if (portamento) { if (mono) { if (portamento_lastnote[0] != -1) { @@ -382,7 +381,7 @@ public class SoftChannel implements Midi = (tuning.getTuning(portamento_lastnote[0]) / 100.0) * (1f / 128f); voice.portamento = true; - portamento_control_note = -1; + controlChange(84, 0); } portamento_lastnote[0] = noteNumber; } else { @@ -449,19 +448,19 @@ public class SoftChannel implements Midi } } - if (portamento_control_note != -1) { + if (controller[84] != 0) { boolean n_found = false; for (int i = 0; i < voices.length; i++) { if (voices[i].on && voices[i].channel == channel && voices[i].active - && voices[i].note == portamento_control_note + && voices[i].note == controller[84] && voices[i].releaseTriggered == false) { voices[i].portamento = true; voices[i].setNote(noteNumber); n_found = true; } } - portamento_control_note = -1; + controlChange(84, 0); if (n_found) return; } @@ -556,6 +555,18 @@ public class SoftChannel implements Midi && voices[i].releaseTriggered == false) { voices[i].noteOff(velocity); } + // We must also check stolen voices + if (voices[i].stealer_channel == this && voices[i].stealer_noteNumber == noteNumber) { + SoftVoice v = voices[i]; + v.stealer_releaseTriggered = false; + v.stealer_channel = null; + v.stealer_performer = null; + v.stealer_voiceID = -1; + v.stealer_noteNumber = 0; + v.stealer_velocity = 0; + v.stealer_extendedConnectionBlocks = null; + v.stealer_channelmixer = null; + } } // Try play back note-off triggered voices, @@ -1141,9 +1152,6 @@ 121 |79H |**Coarse Tuning |0 } } break; - case 84: - portamento_control_note = value; - break; case 98: nrpn_control = (nrpn_control & (127 << 7)) + value; rpn_control = RPN_NULL_VALUE; diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Fri May 22 16:55:42 2009 +0200 @@ -38,11 +38,11 @@ public class SoftChorus implements SoftA private float[] delaybuffer; private int rovepos = 0; - private volatile float gain = 1; - private volatile float rgain = 0; - private volatile float delay = 0; + private float gain = 1; + private float rgain = 0; + private float delay = 0; private float lastdelay = 0; - private volatile float feedback = 0; + private float feedback = 0; public VariableDelay(int maxbuffersize) { delaybuffer = new float[maxbuffersize]; @@ -115,10 +115,8 @@ public class SoftChorus implements SoftA private static class LFODelay { - private volatile double c_cos_delta; - private volatile double c_sin_delta; - private double c_cos = 1; - private double c_sin = 0; + private double phase = 1; + private double phase_step = 0; private double depth = 0; private VariableDelay vdelay; private double samplerate; @@ -139,13 +137,11 @@ public class SoftChorus implements SoftA public void setRate(double rate) { double g = (Math.PI * 2) * (rate / controlrate); - c_cos_delta = Math.cos(g); - c_sin_delta = Math.sin(g); + phase_step = g; } public void setPhase(double phase) { - c_cos = Math.cos(phase); - c_sin = Math.sin(phase); + this.phase = phase; } public void setFeedBack(float feedback) { @@ -161,16 +157,16 @@ public class SoftChorus implements SoftA } public void processMix(float[] in, float[] out, float[] rout) { - c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta; - c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta; - vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2))); + phase += phase_step; + while(phase > (Math.PI * 2)) phase -= (Math.PI * 2); + vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2))); vdelay.processMix(in, out, rout); } public void processReplace(float[] in, float[] out, float[] rout) { - c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta; - c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta; - vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2))); + phase += phase_step; + while(phase > (Math.PI * 2)) phase -= (Math.PI * 2); + vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2))); vdelay.processReplace(in, out, rout); } diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Fri May 22 16:55:42 2009 +0200 @@ -613,4 +613,4 @@ public class SoftFilter { this.last_gain = this.gain; this.last_wet = this.wet; } -} \ No newline at end of file +} diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Fri May 22 16:55:42 2009 +0200 @@ -45,6 +45,13 @@ public class SoftLowFrequencyOscillator private double sin_factor = 0; private static double PI2 = 2.0 * Math.PI; + public SoftLowFrequencyOscillator() { + // If sin_step is 0 then sin_stepfreq must be -INF + for (int i = 0; i < sin_stepfreq.length; i++) { + sin_stepfreq[i] = Double.NEGATIVE_INFINITY; + } + } + public void reset() { for (int i = 0; i < used_count; i++) { out[i][0] = 0; @@ -53,7 +60,8 @@ public class SoftLowFrequencyOscillator freq[i][0] = 0; delay_counter[i] = 0; sin_phase[i] = 0; - sin_stepfreq[i] = 0; + // If sin_step is 0 then sin_stepfreq must be -INF + sin_stepfreq[i] = Double.NEGATIVE_INFINITY; sin_step[i] = 0; } used_count = 0; diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Fri May 22 16:55:42 2009 +0200 @@ -521,7 +521,7 @@ public class SoftMainMixer { cur_registeredMixers = null; } } - + if(!buffers[CHANNEL_MONO].isSilent()) { float[] mono = buffers[CHANNEL_MONO].array(); @@ -572,7 +572,7 @@ public class SoftMainMixer { if (voicestatus[i].active) if (voicestatus[i].channelmixer == null) voicestatus[i].processAudioLogic(buffers); - + if(!buffers[CHANNEL_MONO].isSilent()) { float[] mono = buffers[CHANNEL_MONO].array(); diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Fri May 22 16:55:42 2009 +0200 @@ -803,7 +803,7 @@ public class SoftVoice extends VoiceStat if (rightdry != null) mixAudioStream(rightdry, left, last_out_mixer_left, out_mixer_left); - } else { + } else { if(rightdry == null && last_out_mixer_left == last_out_mixer_right && out_mixer_left == out_mixer_right) @@ -822,7 +822,7 @@ public class SoftVoice extends VoiceStat } } - if (rightdry == null) { + if (rightdry == null) { mixAudioStream(leftdry, eff1, last_out_mixer_effect1, out_mixer_effect1); mixAudioStream(leftdry, eff2, last_out_mixer_effect2, diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -# Providers for midi devices -com.sun.media.sound.RealTimeSequencerProvider -com.sun.media.sound.MidiOutDeviceProvider -com.sun.media.sound.MidiInDeviceProvider -com.sun.media.sound.SoftProvider diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -# Providers for midi sequences -com.sun.media.sound.StandardMidiFileReader diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -# Providers for Midi file writing -com.sun.media.sound.StandardMidiFileWriter diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -# Providers for Soundbanks -com.sun.media.sound.SF2SoundbankReader -com.sun.media.sound.DLSSoundbankReader -com.sun.media.sound.AudioFileSoundbankReader -com.sun.media.sound.JARSoundbankReader diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# Providers for audio file reading -com.sun.media.sound.AuFileReader -com.sun.media.sound.AiffFileReader -com.sun.media.sound.WaveFileReader -com.sun.media.sound.WaveFloatFileReader -com.sun.media.sound.SoftMidiAudioFileReader diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -# Providers for writing audio files -com.sun.media.sound.AuFileWriter -com.sun.media.sound.AiffFileWriter -com.sun.media.sound.WaveFileWriter diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -# Providers for FormatConversion -com.sun.media.sound.UlawCodec -com.sun.media.sound.AlawCodec -com.sun.media.sound.PCMtoPCMCodec -com.sun.media.sound.AudioFloatFormatConverter diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -# last mixer is default mixer -com.sun.media.sound.PortMixerProvider -com.sun.media.sound.DirectAudioDeviceProvider diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# service provider file for Linux: with DirectAudioDeviceProvider -# last mixer is default mixer -com.sun.media.sound.PortMixerProvider -com.sun.media.sound.SimpleInputDeviceProvider -com.sun.media.sound.DirectAudioDeviceProvider -com.sun.media.sound.HeadspaceMixerProvider diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# service provider file for Windows: with DirectAudioDeviceProvider -# last mixer is default mixer -com.sun.media.sound.PortMixerProvider -com.sun.media.sound.SimpleInputDeviceProvider -com.sun.media.sound.DirectAudioDeviceProvider -com.sun.media.sound.HeadspaceMixerProvider diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider Fri May 22 01:12:07 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# service provider file for Windows IA64: with DirectAudioDeviceProvider -# last mixer is default mixer -com.sun.media.sound.PortMixerProvider -com.sun.media.sound.SimpleInputDeviceProvider -com.sun.media.sound.DirectAudioDeviceProvider -com.sun.media.sound.HeadspaceMixerProvider diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java --- a/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java Fri May 22 01:12:07 2009 +0100 +++ b/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java Fri May 22 16:55:42 2009 +0200 @@ -1,10 +1,3 @@ import java.io.File; -import java.io.File; - -import javax.sound.midi.Patch; -import javax.sound.midi.Soundbank; - -import com.sun.media.sound.DLSSoundbankReader; - /* * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,20 +26,27 @@ import com.sun.media.sound.DLSSoundbankR /* @test @summary Test DLSSoundbankReader getSoundbank(File) method */ +import java.io.File; + +import javax.sound.midi.Patch; +import javax.sound.midi.Soundbank; + +import com.sun.media.sound.DLSSoundbankReader; + public class TestGetSoundbankFile { - private static void assertTrue(boolean value) throws Exception - { - if(!value) - throw new RuntimeException("assertTrue fails!"); - } - - public static void main(String[] args) throws Exception { - File file = new File(System.getProperty("test.src", "."), "ding.dls"); - Soundbank dls = new DLSSoundbankReader().getSoundbank(file); - assertTrue(dls.getInstruments().length == 1); - Patch patch = dls.getInstruments()[0].getPatch(); - assertTrue(patch.getProgram() == 0); - assertTrue(patch.getBank() == 0); - } + private static void assertTrue(boolean value) throws Exception From mark at klomp.org Fri May 22 08:03:31 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 22 May 2009 17:03:31 +0200 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> Message-ID: <1243004611.3655.105.camel@hermans.wildebeest.org> On Wed, 2009-05-20 at 21:34 +0100, Andrew John Hughes wrote: > * Please test your favourite shiny feature and report back. When configure --enable-systemtap things seem to work just fine and you can trace lots of stuff. Very cool! :) Unfortunately XRender support seems to be broken: bin/java -Dsun.java2d.xrender=True -classpath ~/src/tests GTest XRender pipeline enabled May 22, 2009 5:01:29 PM sun.awt.X11.XBaseWindow init WARNING: Exception during peer initialization java.lang.UnsatisfiedLinkError: sun.java2d.x11.XSurfaceData.isDrawableValid()Z at sun.java2d.x11.XSurfaceData.isDrawableValid(Native Method) I haven't investigated yet where the native method went. Cheers, Mark From mark at klomp.org Fri May 22 08:15:44 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 22 May 2009 15:15:44 +0000 Subject: changeset in /hg/icedtea: * Makefile.am(ICEDTEA_PATCHES): patche... Message-ID: changeset c1469020162e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c1469020162e description: * Makefile.am(ICEDTEA_PATCHES): patches/icedtea-samejvm-safe.patch added. * patches/icedtea-samejvm-safe.patch: Add packages that are samejvm-safe to TEST.ROOT. * test/jtreg/excludelist.jdk.jtx: Add java/awt/FontClass/CreateFont tests. Hangs jtreg test suite. diffstat: 4 files changed, 27 insertions(+) ChangeLog | 9 +++++++++ Makefile.am | 1 + patches/icedtea-samejvm-safe.patch | 12 ++++++++++++ test/jtreg/excludelist.jdk.jtx | 5 +++++ diffs (55 lines): diff -r b443c3bc7e25 -r c1469020162e ChangeLog --- a/ChangeLog Fri May 22 16:55:42 2009 +0200 +++ b/ChangeLog Fri May 22 17:16:39 2009 +0200 @@ -1,3 +1,12 @@ 2009-05-22 Mark Wielaard + + * Makefile.am(ICEDTEA_PATCHES): patches/icedtea-samejvm-safe.patch + added. + * patches/icedtea-samejvm-safe.patch: Add packages that are + samejvm-safe to TEST.ROOT. + * test/jtreg/excludelist.jdk.jtx: Add java/awt/FontClass/CreateFont + tests. Hangs jtreg test suite. + 2009-05-22 Mark Wielaard * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*, diff -r b443c3bc7e25 -r c1469020162e Makefile.am --- a/Makefile.am Fri May 22 16:55:42 2009 +0200 +++ b/Makefile.am Fri May 22 17:16:39 2009 +0200 @@ -2039,6 +2039,7 @@ ICEDTEA_PATCHES = \ 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 \ diff -r b443c3bc7e25 -r c1469020162e patches/icedtea-samejvm-safe.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-samejvm-safe.patch Fri May 22 17:16:39 2009 +0200 @@ -0,0 +1,12 @@ +--- openjdk.orig/jdk/test/TEST.ROOT 2008-11-06 09:44:52.000000000 +0100 ++++ openjdk/jdk/test/TEST.ROOT 2008-11-23 16:15:53.000000000 +0100 +@@ -4,3 +4,9 @@ + + # The list of keywords supported in the entire test suite + keys=2d dnd i18n ++ ++# List if directory (prefixes) that contain test that are safe to run in ++# -samejvm mode. Only used if the test root (dir containing this file) is ++# given to jtreg and the -samejvm argument is used, ignored otherwise ++# (meaning all tests are assumed to be same jvm safe). ++samejvmsafe=com/sun/crypto com/sun/management com/sun/media com/sun/security java/beans/beancontext java/beans/PropertyChangeSupport java/beans/Statement java/beans/VetoableChangeSupport java/lang/Boolean java/lang/Byte java/lang/Double java/lang/Float java/lang/Integer java/lang/Long java/lang/Short java/lang/Math java/lang/StrictMath java/lang/String java/lang/Throwable java/lang/instrument java/math java/net/URI java/net/URLDecoder java/net/URLEncoder java/nio/Buffer java/nio/ByteOrder java/nio/MappedByteBuffer java/nio/channels/Channels java/nio/channels/DatagramChannel java/nio/channels/spi java/security/cert java/security/Provider java/text java/util/jar java/util/zip java/util/Array java/util/BitSet java/util/Collection java/util/List javax/imageio javax/management/openmbean javax/rmi javax/sound sun/net/www/protocol sun/misc sun/nio sun/security/pkcs11 sun/security/rsa sun/util diff -r b443c3bc7e25 -r c1469020162e test/jtreg/excludelist.jdk.jtx --- a/test/jtreg/excludelist.jdk.jtx Fri May 22 16:55:42 2009 +0200 +++ b/test/jtreg/excludelist.jdk.jtx Fri May 22 17:16:39 2009 +0200 @@ -192,3 +192,8 @@ sun/security/ssl/javax/net/ssl/NewAPIs/S sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java # java.lang.IllegalAccessException: Class com.sun.javatest.regtest.MainWrapper$MainThread can not access a member of class NotBound with modifiers "public static" java/nio/channels/DatagramChannel/NotBound.java + +# Something fishy going on here... +java/awt/FontClass/CreateFont/fileaccess/FontFile.java +java/awt/FontClass/CreateFont/DeleteFont.sh +java/awt/FontClass/CreateFont/bigfont.html From mark at klomp.org Fri May 22 08:17:09 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 22 May 2009 17:17:09 +0200 Subject: make check-jdk work again on icedtea7 Message-ID: <1243005429.3655.119.camel@hermans.wildebeest.org> Hi, make check-jdk was a bit broken in icedtea7 because of a missing patch. This adds the samejvm-safe patch back. It also adds a couple of tests to the exclude list that are currently hanging the jtreg testsuite: 2009-05-22 Mark Wielaard * Makefile.am(ICEDTEA_PATCHES): patches/icedtea-samejvm-safe.patch added. * patches/icedtea-samejvm-safe.patch: Add packages that are samejvm-safe to TEST.ROOT. * test/jtreg/excludelist.jdk.jtx: Add java/awt/FontClass/CreateFont tests. Hangs jtreg test suite. Committed and pushed. Full make check is still running. Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-make-check.patch Type: text/x-patch Size: 2734 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090522/26930b73/fix-make-check.patch From gnu_andrew at member.fsf.org Fri May 22 08:26:31 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 16:26:31 +0100 Subject: make check-jdk work again on icedtea7 In-Reply-To: <1243005429.3655.119.camel@hermans.wildebeest.org> References: <1243005429.3655.119.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905220826s47b9a619q89a0545d7a250d7f@mail.gmail.com> 2009/5/22 Mark Wielaard : > Hi, > > make check-jdk was a bit broken in icedtea7 because of a missing patch. > This adds the samejvm-safe patch back. It also adds a couple of tests to > the exclude list that are currently hanging the jtreg testsuite: > > 2009-05-22 ?Mark Wielaard ? > > ? ?* Makefile.am(ICEDTEA_PATCHES): patches/icedtea-samejvm-safe.patch > ? ?added. > ? ?* patches/icedtea-samejvm-safe.patch: Add packages that are > ? ?samejvm-safe to TEST.ROOT. > ? ?* test/jtreg/excludelist.jdk.jtx: Add java/awt/FontClass/CreateFont > ? ?tests. Hangs jtreg test suite. > > Committed and pushed. > Full make check is still running. > > Cheers, > > Mark > 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 gnu_andrew at member.fsf.org Fri May 22 08:28:05 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 16:28:05 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <1243004611.3655.105.camel@hermans.wildebeest.org> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> 2009/5/22 Mark Wielaard : > On Wed, 2009-05-20 at 21:34 +0100, Andrew John Hughes wrote: >> * Please test your favourite shiny feature and report back. > > When configure --enable-systemtap things seem to work just fine and you > can trace lots of stuff. Very cool! :) > > Unfortunately XRender support seems to be broken: > bin/java -Dsun.java2d.xrender=True -classpath ~/src/tests GTest > > XRender pipeline enabled > May 22, 2009 5:01:29 PM sun.awt.X11.XBaseWindow init > WARNING: Exception during peer initialization > java.lang.UnsatisfiedLinkError: > sun.java2d.x11.XSurfaceData.isDrawableValid()Z > ? ? ? ?at sun.java2d.x11.XSurfaceData.isDrawableValid(Native Method) > > I haven't investigated yet where the native method went. > > Cheers, > > Mark > > Are we using the latest XRender code? I don't know when IcedTea6 was synced, but 7 will have had quite a few build drops since. -- 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 mark at klomp.org Fri May 22 08:47:05 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 22 May 2009 17:47:05 +0200 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> Message-ID: <1243007226.3655.122.camel@hermans.wildebeest.org> Hi Andrew, On Fri, 2009-05-22 at 16:28 +0100, Andrew John Hughes wrote: > > XRender pipeline enabled > > May 22, 2009 5:01:29 PM sun.awt.X11.XBaseWindow init > > WARNING: Exception during peer initialization > > java.lang.UnsatisfiedLinkError: > > sun.java2d.x11.XSurfaceData.isDrawableValid()Z > > at sun.java2d.x11.XSurfaceData.isDrawableValid(Native Method) > > > > I haven't investigated yet where the native method went. > > Are we using the latest XRender code? I don't know when IcedTea6 was > synced, but 7 will have had quite a few build drops since. We are using the latest published code from Clemens. I just pinged him to please publish his later work so we can do more/easier integration. The patches between icedtea6 and icedtea7 are different though, since the ones on 7 have been rebased a couple of time. I suspect one of those rebases might have broken something. I'll try to investigate soon. Cheers, Mark From gnu_andrew at member.fsf.org Fri May 22 09:45:11 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 16:45:11 +0000 Subject: changeset in /hg/icedtea: Avoid build conflicts when using IcedT... Message-ID: changeset 1d35cf933a99 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1d35cf933a99 description: Avoid build conflicts when using IcedTea6 and pre-generated Nimbus. 2009-05-22 Andrew John Hughes * Makefile.am: Copy over Nimbus source files manually rather than using generated as GENSRC to avoid conflicts with IcedTea6. diffstat: 2 files changed, 11 insertions(+), 5 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 9 ++++----- diffs (40 lines): diff -r 082075fb775e -r 1d35cf933a99 ChangeLog --- a/ChangeLog Thu May 21 20:10:28 2009 +0100 +++ b/ChangeLog Fri May 22 17:43:31 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-21 Andrew John Hughes + + * Makefile.am: + Copy over Nimbus source files manually + rather than using generated as GENSRC + to avoid conflicts with IcedTea6. + 2009-05-21 Andrew John Hughes * acinclude.m4: diff -r 082075fb775e -r 1d35cf933a99 Makefile.am --- a/Makefile.am Thu May 21 20:10:28 2009 +0100 +++ b/Makefile.am Fri May 22 17:43:31 2009 +0100 @@ -1581,11 +1581,6 @@ ICEDTEA_ENV += \ "ALT_JAR_CMD=$(ALT_JAR_CMD)" endif -if !ENABLE_NIMBUS_GENERATION -ICEDTEA_ENV += \ - "GENSRCDIR=$(abs_top_builddir)/generated" -endif - env: @echo 'unset JAVA_HOME' @echo 'export $(ICEDTEA_ENV)' @@ -3140,6 +3135,10 @@ if ENABLE_NIMBUS_GENERATION ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR) ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR) ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR) +else + mkdir -p $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf + cp -a $(abs_topbuilddir)/generated/javax/swing/plaf/nimbus \ + $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf endif endif mkdir -p stamps From ahughes at redhat.com Fri May 22 09:45:12 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 22 May 2009 16:45:12 +0000 Subject: changeset in /hg/icedtea: Merge. Message-ID: changeset 9e6600d4fef2 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9e6600d4fef2 description: Merge. diffstat: 2 files changed, 11 insertions(+), 5 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 9 ++++----- diffs (40 lines): diff -r 6124157d5bdb -r 9e6600d4fef2 ChangeLog --- a/ChangeLog Fri May 22 01:12:07 2009 +0100 +++ b/ChangeLog Fri May 22 17:44:57 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-21 Andrew John Hughes + + * Makefile.am: + Copy over Nimbus source files manually + rather than using generated as GENSRC + to avoid conflicts with IcedTea6. + 2009-05-21 Andrew John Hughes * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: diff -r 6124157d5bdb -r 9e6600d4fef2 Makefile.am --- a/Makefile.am Fri May 22 01:12:07 2009 +0100 +++ b/Makefile.am Fri May 22 17:44:57 2009 +0100 @@ -1581,11 +1581,6 @@ ICEDTEA_ENV += \ "ALT_JAR_CMD=$(ALT_JAR_CMD)" endif -if !ENABLE_NIMBUS_GENERATION -ICEDTEA_ENV += \ - "GENSRCDIR=$(abs_top_builddir)/generated" -endif - env: @echo 'unset JAVA_HOME' @echo 'export $(ICEDTEA_ENV)' @@ -3140,6 +3135,10 @@ if ENABLE_NIMBUS_GENERATION ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR) ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR) ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR) +else + mkdir -p $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf + cp -a $(abs_topbuilddir)/generated/javax/swing/plaf/nimbus \ + $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf endif endif mkdir -p stamps From ahughes at redhat.com Fri May 22 09:45:12 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 22 May 2009 16:45:12 +0000 Subject: changeset in /hg/icedtea: Merge. Message-ID: changeset 27a1779cfd51 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=27a1779cfd51 description: Merge. diffstat: 38 files changed, 649 insertions(+), 469 deletions(-) ChangeLog | 38 ++ Makefile.am | 1 fsg.sh | 7 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 13 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 46 +- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java | 30 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java | 32 -- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 10 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider | 5 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader | 5 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider | 5 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider | 3 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider | 6 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java | 42 +- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java | 64 ++-- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java | 158 +++++----- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java | 46 +- overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java | 24 - overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java | 42 +- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java | 64 ++-- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java | 158 +++++----- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java | 46 +- overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java | 55 ++- overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Interpolate.java | 2 overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java | 2 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java | 106 ++++++ overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java | 55 ++- patches/icedtea-samejvm-safe.patch | 12 test/jtreg/excludelist.jdk.jtx | 5 diffs (truncated from 1689 to 500 lines): diff -r 9e6600d4fef2 -r 27a1779cfd51 ChangeLog --- a/ChangeLog Fri May 22 17:44:57 2009 +0100 +++ b/ChangeLog Fri May 22 17:47:18 2009 +0100 @@ -4,6 +4,44 @@ 2009-05-22 Andrew John Hughes + + * Makefile.am(ICEDTEA_PATCHES): patches/icedtea-samejvm-safe.patch + added. + * patches/icedtea-samejvm-safe.patch: Add packages that are + samejvm-safe to TEST.ROOT. + * test/jtreg/excludelist.jdk.jtx: Add java/awt/FontClass/CreateFont + tests. Hangs jtreg test suite. + +2009-05-22 Mark Wielaard + + * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*, + overlays/openjdk/jdk/test/com/sun/media/sound/*: + Import Gervill fixes from CVS. See CHANGES.txt: + + 6823446: Gervill SoftLowFrequencyOscillator fails when freq is + set to 0 cent or 8.1758 Hz. + 6823445: Gervill SoftChannel/ResetAllControllers jtreg test + fails after portamento fix from last merge. + 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 + + - Fix: Notes get stuck on when we overflow the synthesizer + with rapid note on /off messages. + JTreg test has been created: + test/com/sun/media/sound/SoftChannel/NoteOverFlowTest + - Fix: Portamento controller reset to wrong value in + SoftChannel.resetAllControllers. + This caused incorrect glider effect in some midi files. + For example in TuningApplet1 in TET-7 keyboard, + when note was pressed for first time a glider effect could be + heard. + - Fix: Delay modulation calculation in SoftChorus.LFODelay where + incorrect. + - Fix: Removed unnecessary volatile keywords in SoftChorus. + * fsg.sh: Don't remove (non-existing) com/sun/media/sound services. + * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services: + removed. 2009-05-21 Andrew John Hughes diff -r 9e6600d4fef2 -r 27a1779cfd51 Makefile.am --- a/Makefile.am Fri May 22 17:44:57 2009 +0100 +++ b/Makefile.am Fri May 22 17:47:18 2009 +0100 @@ -2034,6 +2034,7 @@ ICEDTEA_PATCHES = \ 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 \ diff -r 9e6600d4fef2 -r 27a1779cfd51 fsg.sh --- a/fsg.sh Fri May 22 17:44:57 2009 +0100 +++ b/fsg.sh Fri May 22 17:47:18 2009 +0100 @@ -102,12 +102,5 @@ rm -rf openjdk/jdk/src/share/classes/com rm -rf openjdk/jdk/src/share/classes/com/sun/jmx/snmp rm -rf openjdk/jdk/test/com/sun/jmx/snmp -# Remove support for proprietary sound -rm -rf openjdk/jdk/src/share/classes/com/sun/media/sound/services -rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/MixerSynthProvider.java -rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/RmfFileReader.java -rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/HsbParser.java -rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInputDeviceProvider.java - # Remove registration tests rm -rf openjdk/jdk/test/com/sun/servicetag diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Fri May 22 17:47:18 2009 +0100 @@ -1,3 +1,16 @@ +6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz. +6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge. +6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 + + - Fix: Notes get stuck on when we overflow the synthesizer with rapid note on/off messages. + JTreg test has been created: + test/com/sun/media/sound/SoftChannel/NoteOverFlowTest + - Fix: Portamento controller reset to wrong value in SoftChannel.resetAllControllers. + This caused incorrect glider effect in some midi files. + For example in TuningApplet1 in TET-7 keyboard, + when note was pressed for first time a glider effect could be heard. + - Fix: Delay modulation calculation in SoftChorus.LFODelay where incorrect. + - Fix: Removed unnecessary volatile keywords in SoftChorus. - Fix: Throw IllegalArgumentException Exception on invalid soundbank to: SoftSynthesizer.unloadAllInstruments(Soundbank soundbank) diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Fri May 22 17:47:18 2009 +0100 @@ -1,27 +1,27 @@ /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * 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. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ + * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the LICENSE file that accompanied this code. + * + * 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ package com.sun.media.sound; diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Fri May 22 17:47:18 2009 +0100 @@ -93,7 +93,6 @@ public class SoftChannel implements Midi protected double portamento_time = 1; // keyschanges per control buffer time protected int[] portamento_lastnote = new int[128]; protected int portamento_lastnote_ix = 0; - private int portamento_control_note = -1; private boolean portamento = false; private boolean mono = false; private boolean mute = false; @@ -369,12 +368,12 @@ public class SoftChannel implements Midi voice.setSoloMute(solomute); if (releaseTriggered) return; - if (portamento_control_note != -1) { + if (controller[84] != 0) { voice.co_noteon_keynumber[0] - = (tuning.getTuning(portamento_control_note) / 100.0) + = (tuning.getTuning(controller[84]) / 100.0) * (1f / 128f); voice.portamento = true; - portamento_control_note = -1; + controlChange(84, 0); } else if (portamento) { if (mono) { if (portamento_lastnote[0] != -1) { @@ -382,7 +381,7 @@ public class SoftChannel implements Midi = (tuning.getTuning(portamento_lastnote[0]) / 100.0) * (1f / 128f); voice.portamento = true; - portamento_control_note = -1; + controlChange(84, 0); } portamento_lastnote[0] = noteNumber; } else { @@ -449,19 +448,19 @@ public class SoftChannel implements Midi } } - if (portamento_control_note != -1) { + if (controller[84] != 0) { boolean n_found = false; for (int i = 0; i < voices.length; i++) { if (voices[i].on && voices[i].channel == channel && voices[i].active - && voices[i].note == portamento_control_note + && voices[i].note == controller[84] && voices[i].releaseTriggered == false) { voices[i].portamento = true; voices[i].setNote(noteNumber); n_found = true; } } - portamento_control_note = -1; + controlChange(84, 0); if (n_found) return; } @@ -556,6 +555,18 @@ public class SoftChannel implements Midi && voices[i].releaseTriggered == false) { voices[i].noteOff(velocity); } + // We must also check stolen voices + if (voices[i].stealer_channel == this && voices[i].stealer_noteNumber == noteNumber) { + SoftVoice v = voices[i]; + v.stealer_releaseTriggered = false; + v.stealer_channel = null; + v.stealer_performer = null; + v.stealer_voiceID = -1; + v.stealer_noteNumber = 0; + v.stealer_velocity = 0; + v.stealer_extendedConnectionBlocks = null; + v.stealer_channelmixer = null; + } } // Try play back note-off triggered voices, @@ -1141,9 +1152,6 @@ 121 |79H |**Coarse Tuning |0 } } break; - case 84: - portamento_control_note = value; - break; case 98: nrpn_control = (nrpn_control & (127 << 7)) + value; rpn_control = RPN_NULL_VALUE; diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Fri May 22 17:47:18 2009 +0100 @@ -38,11 +38,11 @@ public class SoftChorus implements SoftA private float[] delaybuffer; private int rovepos = 0; - private volatile float gain = 1; - private volatile float rgain = 0; - private volatile float delay = 0; + private float gain = 1; + private float rgain = 0; + private float delay = 0; private float lastdelay = 0; - private volatile float feedback = 0; + private float feedback = 0; public VariableDelay(int maxbuffersize) { delaybuffer = new float[maxbuffersize]; @@ -115,10 +115,8 @@ public class SoftChorus implements SoftA private static class LFODelay { - private volatile double c_cos_delta; - private volatile double c_sin_delta; - private double c_cos = 1; - private double c_sin = 0; + private double phase = 1; + private double phase_step = 0; private double depth = 0; private VariableDelay vdelay; private double samplerate; @@ -139,13 +137,11 @@ public class SoftChorus implements SoftA public void setRate(double rate) { double g = (Math.PI * 2) * (rate / controlrate); - c_cos_delta = Math.cos(g); - c_sin_delta = Math.sin(g); + phase_step = g; } public void setPhase(double phase) { - c_cos = Math.cos(phase); - c_sin = Math.sin(phase); + this.phase = phase; } public void setFeedBack(float feedback) { @@ -161,16 +157,16 @@ public class SoftChorus implements SoftA } public void processMix(float[] in, float[] out, float[] rout) { - c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta; - c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta; - vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2))); + phase += phase_step; + while(phase > (Math.PI * 2)) phase -= (Math.PI * 2); + vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2))); vdelay.processMix(in, out, rout); } public void processReplace(float[] in, float[] out, float[] rout) { - c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta; - c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta; - vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2))); + phase += phase_step; + while(phase > (Math.PI * 2)) phase -= (Math.PI * 2); + vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2))); vdelay.processReplace(in, out, rout); } diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Fri May 22 17:47:18 2009 +0100 @@ -613,4 +613,4 @@ public class SoftFilter { this.last_gain = this.gain; this.last_wet = this.wet; } -} \ No newline at end of file +} diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Fri May 22 17:47:18 2009 +0100 @@ -45,6 +45,13 @@ public class SoftLowFrequencyOscillator private double sin_factor = 0; private static double PI2 = 2.0 * Math.PI; + public SoftLowFrequencyOscillator() { + // If sin_step is 0 then sin_stepfreq must be -INF + for (int i = 0; i < sin_stepfreq.length; i++) { + sin_stepfreq[i] = Double.NEGATIVE_INFINITY; + } + } + public void reset() { for (int i = 0; i < used_count; i++) { out[i][0] = 0; @@ -53,7 +60,8 @@ public class SoftLowFrequencyOscillator freq[i][0] = 0; delay_counter[i] = 0; sin_phase[i] = 0; - sin_stepfreq[i] = 0; + // If sin_step is 0 then sin_stepfreq must be -INF + sin_stepfreq[i] = Double.NEGATIVE_INFINITY; sin_step[i] = 0; } used_count = 0; diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Fri May 22 17:47:18 2009 +0100 @@ -521,7 +521,7 @@ public class SoftMainMixer { cur_registeredMixers = null; } } - + if(!buffers[CHANNEL_MONO].isSilent()) { float[] mono = buffers[CHANNEL_MONO].array(); @@ -572,7 +572,7 @@ public class SoftMainMixer { if (voicestatus[i].active) if (voicestatus[i].channelmixer == null) voicestatus[i].processAudioLogic(buffers); - + if(!buffers[CHANNEL_MONO].isSilent()) { float[] mono = buffers[CHANNEL_MONO].array(); diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Fri May 22 17:47:18 2009 +0100 @@ -803,7 +803,7 @@ public class SoftVoice extends VoiceStat if (rightdry != null) mixAudioStream(rightdry, left, last_out_mixer_left, out_mixer_left); - } else { + } else { if(rightdry == null && last_out_mixer_left == last_out_mixer_right && out_mixer_left == out_mixer_right) @@ -822,7 +822,7 @@ public class SoftVoice extends VoiceStat } } - if (rightdry == null) { + if (rightdry == null) { mixAudioStream(leftdry, eff1, last_out_mixer_effect1, out_mixer_effect1); mixAudioStream(leftdry, eff2, last_out_mixer_effect2, diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -# Providers for midi devices -com.sun.media.sound.RealTimeSequencerProvider -com.sun.media.sound.MidiOutDeviceProvider -com.sun.media.sound.MidiInDeviceProvider -com.sun.media.sound.SoftProvider diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -# Providers for midi sequences -com.sun.media.sound.StandardMidiFileReader diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -# Providers for Midi file writing -com.sun.media.sound.StandardMidiFileWriter diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -# Providers for Soundbanks -com.sun.media.sound.SF2SoundbankReader -com.sun.media.sound.DLSSoundbankReader -com.sun.media.sound.AudioFileSoundbankReader -com.sun.media.sound.JARSoundbankReader diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# Providers for audio file reading -com.sun.media.sound.AuFileReader -com.sun.media.sound.AiffFileReader -com.sun.media.sound.WaveFileReader -com.sun.media.sound.WaveFloatFileReader -com.sun.media.sound.SoftMidiAudioFileReader diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -# Providers for writing audio files -com.sun.media.sound.AuFileWriter -com.sun.media.sound.AiffFileWriter -com.sun.media.sound.WaveFileWriter diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -# Providers for FormatConversion -com.sun.media.sound.UlawCodec -com.sun.media.sound.AlawCodec -com.sun.media.sound.PCMtoPCMCodec -com.sun.media.sound.AudioFloatFormatConverter diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -# last mixer is default mixer -com.sun.media.sound.PortMixerProvider -com.sun.media.sound.DirectAudioDeviceProvider diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# service provider file for Linux: with DirectAudioDeviceProvider -# last mixer is default mixer -com.sun.media.sound.PortMixerProvider -com.sun.media.sound.SimpleInputDeviceProvider -com.sun.media.sound.DirectAudioDeviceProvider -com.sun.media.sound.HeadspaceMixerProvider diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# service provider file for Windows: with DirectAudioDeviceProvider -# last mixer is default mixer -com.sun.media.sound.PortMixerProvider -com.sun.media.sound.SimpleInputDeviceProvider -com.sun.media.sound.DirectAudioDeviceProvider -com.sun.media.sound.HeadspaceMixerProvider diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider Fri May 22 17:44:57 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# service provider file for Windows IA64: with DirectAudioDeviceProvider -# last mixer is default mixer -com.sun.media.sound.PortMixerProvider -com.sun.media.sound.SimpleInputDeviceProvider -com.sun.media.sound.DirectAudioDeviceProvider -com.sun.media.sound.HeadspaceMixerProvider diff -r 9e6600d4fef2 -r 27a1779cfd51 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java --- a/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java Fri May 22 17:44:57 2009 +0100 +++ b/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java Fri May 22 17:47:18 2009 +0100 @@ -1,10 +1,3 @@ import java.io.File; -import java.io.File; - -import javax.sound.midi.Patch; -import javax.sound.midi.Soundbank; - -import com.sun.media.sound.DLSSoundbankReader; - /* * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,20 +26,27 @@ import com.sun.media.sound.DLSSoundbankR /* @test @summary Test DLSSoundbankReader getSoundbank(File) method */ +import java.io.File; From langel at redhat.com Fri May 22 10:03:35 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 22 May 2009 17:03:35 +0000 Subject: changeset in /hg/icedtea: 2009-05-22 Lillian Angel changeset 8070d13626fa in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8070d13626fa description: 2009-05-22 Lillian Angel * Makefile.am: Fixed typo. diffstat: 2 files changed, 5 insertions(+), 1 deletion(-) ChangeLog | 4 ++++ Makefile.am | 2 +- diffs (23 lines): diff -r 27a1779cfd51 -r 8070d13626fa ChangeLog --- a/ChangeLog Fri May 22 17:47:18 2009 +0100 +++ b/ChangeLog Fri May 22 13:04:43 2009 -0400 @@ -1,3 +1,7 @@ 2009-05-22 Andrew John Hughes + + * Makefile.am: Fixed typo. + 2009-05-22 Andrew John Hughes * Makefile.am: diff -r 27a1779cfd51 -r 8070d13626fa Makefile.am --- a/Makefile.am Fri May 22 17:47:18 2009 +0100 +++ b/Makefile.am Fri May 22 13:04:43 2009 -0400 @@ -3138,7 +3138,7 @@ if ENABLE_NIMBUS_GENERATION ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR) else mkdir -p $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf - cp -a $(abs_topbuilddir)/generated/javax/swing/plaf/nimbus \ + cp -a $(abs_top_builddir)/generated/javax/swing/plaf/nimbus \ $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf endif endif From gnu_andrew at member.fsf.org Fri May 22 10:31:20 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 18:31:20 +0100 Subject: changeset in /hg/icedtea: 2009-05-22 Lillian Angel References: Message-ID: <17c6771e0905221031n127e8ef4lcb25c4d7c0536dfe@mail.gmail.com> 2009/5/22 Lillian Angel : > changeset 8070d13626fa in /hg/icedtea > details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8070d13626fa > description: > ? ? ? ?2009-05-22 ?Lillian Angel ? > > ? ? ? ? ? ? ? ?* Makefile.am: Fixed typo. > > diffstat: > > 2 files changed, 5 insertions(+), 1 deletion(-) > ChangeLog ? | ? ?4 ++++ > Makefile.am | ? ?2 +- > > diffs (23 lines): > > diff -r 27a1779cfd51 -r 8070d13626fa ChangeLog > --- a/ChangeLog Fri May 22 17:47:18 2009 +0100 > +++ b/ChangeLog Fri May 22 13:04:43 2009 -0400 > @@ -1,3 +1,7 @@ 2009-05-22 ?Andrew John Hughes ? +2009-05-22 ?Lillian Angel ? > + > + ? ? ? * Makefile.am: Fixed typo. > + > ?2009-05-22 ?Andrew John Hughes ? > > ? ? ? ?* Makefile.am: > diff -r 27a1779cfd51 -r 8070d13626fa Makefile.am > --- a/Makefile.am ? ? ? Fri May 22 17:47:18 2009 +0100 > +++ b/Makefile.am ? ? ? Fri May 22 13:04:43 2009 -0400 > @@ -3138,7 +3138,7 @@ if ENABLE_NIMBUS_GENERATION > ? ? ? ?ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR) > ?else > ? ? ? ?mkdir -p $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf > - ? ? ? cp -a $(abs_topbuilddir)/generated/javax/swing/plaf/nimbus \ > + ? ? ? cp -a $(abs_top_builddir)/generated/javax/swing/plaf/nimbus \ > ? ? ? ? ?$(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf > ?endif > ?endif > Thanks. I fixed it in the Makefile but obviously didn't copy that to Makefile.am :( -- 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 Fri May 22 10:35:13 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 18:35:13 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <1243007226.3655.122.camel@hermans.wildebeest.org> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> 2009/5/22 Mark Wielaard : > Hi Andrew, > > On Fri, 2009-05-22 at 16:28 +0100, Andrew John Hughes wrote: >> > XRender pipeline enabled >> > May 22, 2009 5:01:29 PM sun.awt.X11.XBaseWindow init >> > WARNING: Exception during peer initialization >> > java.lang.UnsatisfiedLinkError: >> > sun.java2d.x11.XSurfaceData.isDrawableValid()Z >> > ? ? ? ?at sun.java2d.x11.XSurfaceData.isDrawableValid(Native Method) >> > >> > I haven't investigated yet where the native method went. >> >> Are we using the latest XRender code? I don't know when IcedTea6 was >> synced, but 7 will have had quite a few build drops since. > > We are using the latest published code from Clemens. I just pinged him > to please publish his later work so we can do more/easier integration. > The patches between icedtea6 and icedtea7 are different though, since > the ones on 7 have been rebased a couple of time. I suspect one of those > rebases might have broken something. I'll try to investigate soon. > > Cheers, > > Mark > > Hmm, there's a forest for this... Are there any negative side-effects to having this code applied all the time? Might be easier to just pull Clemens' changesets into the icedTea forest and save all this messing around with patches. -- 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 mark at klomp.org Fri May 22 11:05:08 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 22 May 2009 20:05:08 +0200 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> Message-ID: <1243015508.3655.123.camel@hermans.wildebeest.org> Hi Andrew, On Fri, 2009-05-22 at 18:35 +0100, Andrew John Hughes wrote: > Are there any negative side-effects to having this code applied all the time? No, the patches are designed so that without the property set the old pipeline is used. Cheers, Mark From gnu_andrew at member.fsf.org Fri May 22 11:23:40 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 19:23:40 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <1243015508.3655.123.camel@hermans.wildebeest.org> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905221123v5de224dxc84e5f8857b62866@mail.gmail.com> 2009/5/22 Mark Wielaard : > Hi Andrew, > > On Fri, 2009-05-22 at 18:35 +0100, Andrew John Hughes wrote: >> Are there any negative side-effects to having this code applied all the time? > > No, the patches are designed so that without the property set the old > pipeline is used. > > Cheers, > > Mark > > Ok after the release, I'll drop the patches and merge Xrender in to the IcedTea forest from the Xrender forest. Having it always built should track any breakages more easily. -- 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 mark at klomp.org Fri May 22 15:02:18 2009 From: mark at klomp.org (Mark Wielaard) Date: Sat, 23 May 2009 00:02:18 +0200 Subject: make check-jdk work again on icedtea7 In-Reply-To: <1243005429.3655.119.camel@hermans.wildebeest.org> References: <1243005429.3655.119.camel@hermans.wildebeest.org> Message-ID: <1243029738.3946.46.camel@hermans.wildebeest.org> On Fri, 2009-05-22 at 17:17 +0200, Mark Wielaard wrote: > Full make check is still running. Results published here: http://icedtea.classpath.org/~mjw/jtreg7/ --------------- jtreg console summary for hotspot --------------- Error: compiler/6636138/Test1.java Error: compiler/6636138/Test2.java FAILED: compiler/6823453/Test.java Test results: passed: 35; failed: 1; error: 2 The failures and errors do seem like test case bugs (the errors are about a missing public main() methods, the failure is about an unknown -XX option). --------------- jtreg console summary for langtools --------------- Test results: passed: 1,475 Hurray! Perfect. --------------- jtreg console summary for jdk --------------- [... too many to list ...] Test results: passed: 3,513; failed: 289; error: 5 A large part of this is the FontManager issue we already discussed on irc. ArrayIndexOutOfBoundsException: 20 at sun.font.FontManager.registerCompositeFont(FontManager.java:535) Another large bunch is the javax.management failures that all fail with NoClassDefFoundError: org/omg/stub/javax/management/remote/rmi/_RMIConnection_Stub Full list of errors: http://icedtea.classpath.org/~mjw/jtreg7/jdk/html/error.html Full list of failures: http://icedtea.classpath.org/~mjw/jtreg7/jdk/html/failed.html As comparison the icedtea6 results: http://icedtea.classpath.org/~mjw/jtreg/jdk/ Test results: passed: 3,334; failed: 19; error: 2 From gnu_andrew at member.fsf.org Fri May 22 15:18:42 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 23:18:42 +0100 Subject: make check-jdk work again on icedtea7 In-Reply-To: <1243029738.3946.46.camel@hermans.wildebeest.org> References: <1243005429.3655.119.camel@hermans.wildebeest.org> <1243029738.3946.46.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905221518p5767600dof1ad09fa0c59332c@mail.gmail.com> 2009/5/22 Mark Wielaard : > On Fri, 2009-05-22 at 17:17 +0200, Mark Wielaard wrote: >> Full make check is still running. > > Results published here: > http://icedtea.classpath.org/~mjw/jtreg7/ > > --------------- jtreg console summary for hotspot --------------- > Error: ?compiler/6636138/Test1.java > Error: ?compiler/6636138/Test2.java > FAILED: compiler/6823453/Test.java > Test results: passed: 35; failed: 1; error: 2 > > The failures and errors do seem like test case bugs (the errors are > about a missing public main() methods, the failure is about an unknown > -XX option). > Good. I think a lot of test cases aren't getting updated at 7 (at least there were a number I fixed where the API had changed but not the test case) > --------------- jtreg console summary for langtools --------------- > Test results: passed: 1,475 > > Hurray! Perfect. > Great! > --------------- jtreg console summary for jdk --------------- > [... too many to list ...] > Test results: passed: 3,513; failed: 289; error: 5 > > A large part of this is the FontManager issue we already discussed on > irc. ArrayIndexOutOfBoundsException: 20 at > sun.font.FontManager.registerCompositeFont(FontManager.java:535) > Yeah, working on this. I do know it's local to the IcedTea patch set (even if it's not the patch that's the bug, it triggers the issue). > Another large bunch is the javax.management failures that all fail with > NoClassDefFoundError: > org/omg/stub/javax/management/remote/rmi/_RMIConnection_Stub > Sounds like a rmic error. How did you build? > Full list of errors: > http://icedtea.classpath.org/~mjw/jtreg7/jdk/html/error.html > Full list of failures: > http://icedtea.classpath.org/~mjw/jtreg7/jdk/html/failed.html > > As comparison the icedtea6 results: > http://icedtea.classpath.org/~mjw/jtreg/jdk/ > Test results: passed: 3,334; failed: 19; error: 2 > > -- 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 mark at klomp.org Fri May 22 15:25:44 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 22 May 2009 22:25:44 +0000 Subject: changeset in /hg/icedtea: * patches/xrender/icedtea-002.patch: C... Message-ID: changeset 23732a06b248 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=23732a06b248 description: * patches/xrender/icedtea-002.patch: Correct rebase. Add Java_sun_java2d_x11_XSurfaceData_isDrawableValid and Java_sun_java2d_x11_XSurfaceData_setInvalid back. diffstat: 2 files changed, 18 insertions(+), 6 deletions(-) ChangeLog | 6 ++++++ patches/xrender/icedtea-002.patch | 18 ++++++++++++------ diffs (53 lines): diff -r 8070d13626fa -r 23732a06b248 ChangeLog --- a/ChangeLog Fri May 22 13:04:43 2009 -0400 +++ b/ChangeLog Sat May 23 00:26:46 2009 +0200 @@ -1,3 +1,9 @@ 2009-05-22 Lillian Angel + + * patches/xrender/icedtea-002.patch: Correct rebase. Add + Java_sun_java2d_x11_XSurfaceData_isDrawableValid and + Java_sun_java2d_x11_XSurfaceData_setInvalid back. + 2009-05-22 Lillian Angel * Makefile.am: Fixed typo. diff -r 8070d13626fa -r 23732a06b248 patches/xrender/icedtea-002.patch --- a/patches/xrender/icedtea-002.patch Fri May 22 13:04:43 2009 -0400 +++ b/patches/xrender/icedtea-002.patch Sat May 23 00:26:46 2009 +0200 @@ -10,10 +10,9 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi ifeq ($(PLATFORM), solaris) -diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers ---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2009-01-18 01:30:31.000000000 +0000 -+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-01-18 01:48:17.000000000 +0000 -@@ -316,6 +316,13 @@ +--- openjdk/jdk/make/sun/xawt/mapfile-vers.orig 2009-05-22 22:09:17.215916337 +0200 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-05-22 22:11:26.919916611 +0200 +@@ -334,6 +334,15 @@ Java_sun_java2d_opengl_GLXSurfaceData_initOps; Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer; @@ -22,13 +21,20 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt + Java_sun_java2d_x11_XSurfaceData_XResetClip; + Java_sun_java2d_x11_XSurfaceData_XSetClip; + Java_sun_java2d_x11_XSurfaceData_flushNativeSurface; ++ Java_sun_java2d_x11_XSurfaceData_isDrawableValid; ++ Java_sun_java2d_x11_XSurfaceData_setInvalid; + Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures; + Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg; Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit; Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask; -@@ -338,16 +345,10 @@ - Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; +@@ -351,21 +360,13 @@ + Java_sun_java2d_x11_X11Renderer_XFillRect; + Java_sun_java2d_x11_X11Renderer_XFillRoundRect; + Java_sun_java2d_x11_X11Renderer_devCopyArea; +- Java_sun_java2d_x11_X11SurfaceData_setInvalid; + Java_sun_java2d_x11_X11SurfaceData_initIDs; +- Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable; Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable; - Java_sun_java2d_x11_X11SurfaceData_initOps; From gnu_andrew at member.fsf.org Fri May 22 15:29:42 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 22 May 2009 23:29:42 +0100 Subject: IcedTea7 release Message-ID: <17c6771e0905221529t28aa3193h113279244a1a6471@mail.gmail.com> For those not on IRC... I'm going to probably wait until Tuesday (Monday is a bank holiday in the UK) to do the release. We found a number of issues notably with AWT on IcedTea builds (but not in JDK7). This also gives some time to see if there is any further build drops from Sun. I think b60 was deemed unnecessary, but there's not been any clear notification that I've seen. Zero now works. I'm fixing some issues with the Shark build at present. I will tag and email again once these issues are cleared up, and people can test from that tag. -- 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 mark at klomp.org Fri May 22 15:29:55 2009 From: mark at klomp.org (Mark Wielaard) Date: Sat, 23 May 2009 00:29:55 +0200 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <1243004611.3655.105.camel@hermans.wildebeest.org> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> Message-ID: <1243031395.3946.49.camel@hermans.wildebeest.org> On Fri, 2009-05-22 at 17:03 +0200, Mark Wielaard wrote: > Unfortunately XRender support seems to be broken: > bin/java -Dsun.java2d.xrender=True -classpath ~/src/tests GTest > > XRender pipeline enabled > May 22, 2009 5:01:29 PM sun.awt.X11.XBaseWindow init > WARNING: Exception during peer initialization > java.lang.UnsatisfiedLinkError: > sun.java2d.x11.XSurfaceData.isDrawableValid()Z > at sun.java2d.x11.XSurfaceData.isDrawableValid(Native Method) > > I haven't investigated yet where the native method went. Found it. There was mixup in one of the rebased patches. Fixed as follows: 2009-05-22 Mark Wielaard * patches/xrender/icedtea-002.patch: Correct rebase. Add Java_sun_java2d_x11_XSurfaceData_isDrawableValid and Java_sun_java2d_x11_XSurfaceData_setInvalid back. Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: xrender-fixup.patch Type: text/x-patch Size: 2080 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090523/121792e7/xrender-fixup.patch From mark at klomp.org Fri May 22 15:37:41 2009 From: mark at klomp.org (Mark Wielaard) Date: Sat, 23 May 2009 00:37:41 +0200 Subject: make check-jdk work again on icedtea7 In-Reply-To: <17c6771e0905221518p5767600dof1ad09fa0c59332c@mail.gmail.com> References: <1243005429.3655.119.camel@hermans.wildebeest.org> <1243029738.3946.46.camel@hermans.wildebeest.org> <17c6771e0905221518p5767600dof1ad09fa0c59332c@mail.gmail.com> Message-ID: <1243031861.3946.50.camel@hermans.wildebeest.org> On Fri, 2009-05-22 at 23:18 +0100, Andrew John Hughes wrote: > > Another large bunch is the javax.management failures that all fail with > > NoClassDefFoundError: > > org/omg/stub/javax/management/remote/rmi/_RMIConnection_Stub > > > Sounds like a rmic error. How did you build? ./configure && make how else? :) (OK, I did throw in an --enable-systemtap) From ahughes at redhat.com Fri May 22 16:39:09 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 22 May 2009 23:39:09 +0000 Subject: changeset in /hg/icedtea: Merge. Message-ID: changeset 03cb176986bc in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=03cb176986bc description: Merge. diffstat: 2 files changed, 18 insertions(+), 6 deletions(-) ChangeLog | 6 ++++++ patches/xrender/icedtea-002.patch | 18 ++++++++++++------ diffs (54 lines): diff -r e160d9e94f4e -r 03cb176986bc ChangeLog --- a/ChangeLog Fri May 22 23:35:26 2009 +0100 +++ b/ChangeLog Sat May 23 00:41:28 2009 +0100 @@ -1,4 +1,10 @@ 2009-05-22 Andrew John Hughes + + * patches/xrender/icedtea-002.patch: Correct rebase. Add + Java_sun_java2d_x11_XSurfaceData_isDrawableValid and + Java_sun_java2d_x11_XSurfaceData_setInvalid back. + +2009-05-22 Mark Wielaard * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Define InlineSmallCode, using x86 value to begin with. diff -r e160d9e94f4e -r 03cb176986bc patches/xrender/icedtea-002.patch --- a/patches/xrender/icedtea-002.patch Fri May 22 23:35:26 2009 +0100 +++ b/patches/xrender/icedtea-002.patch Sat May 23 00:41:28 2009 +0100 @@ -10,10 +10,9 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi ifeq ($(PLATFORM), solaris) -diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers ---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2009-01-18 01:30:31.000000000 +0000 -+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-01-18 01:48:17.000000000 +0000 -@@ -316,6 +316,13 @@ +--- openjdk/jdk/make/sun/xawt/mapfile-vers.orig 2009-05-22 22:09:17.215916337 +0200 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-05-22 22:11:26.919916611 +0200 +@@ -334,6 +334,15 @@ Java_sun_java2d_opengl_GLXSurfaceData_initOps; Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer; @@ -22,13 +21,20 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt + Java_sun_java2d_x11_XSurfaceData_XResetClip; + Java_sun_java2d_x11_XSurfaceData_XSetClip; + Java_sun_java2d_x11_XSurfaceData_flushNativeSurface; ++ Java_sun_java2d_x11_XSurfaceData_isDrawableValid; ++ Java_sun_java2d_x11_XSurfaceData_setInvalid; + Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures; + Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg; Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit; Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask; -@@ -338,16 +345,10 @@ - Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; +@@ -351,21 +360,13 @@ + Java_sun_java2d_x11_X11Renderer_XFillRect; + Java_sun_java2d_x11_X11Renderer_XFillRoundRect; + Java_sun_java2d_x11_X11Renderer_devCopyArea; +- Java_sun_java2d_x11_X11SurfaceData_setInvalid; + Java_sun_java2d_x11_X11SurfaceData_initIDs; +- Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable; Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable; - Java_sun_java2d_x11_X11SurfaceData_initOps; From ahughes at redhat.com Fri May 22 16:39:09 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 22 May 2009 23:39:09 +0000 Subject: changeset in /hg/icedtea: Fix the Shark build by defining Inline... Message-ID: changeset e160d9e94f4e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e160d9e94f4e description: Fix the Shark build by defining InlineSmallCode. 2009-05-22 Andrew John Hughes * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Define InlineSmallCode, using x86 value to begin with. diffstat: 2 files changed, 6 insertions(+) ChangeLog | 5 +++++ ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 1 + diffs (23 lines): diff -r 8070d13626fa -r e160d9e94f4e ChangeLog --- a/ChangeLog Fri May 22 13:04:43 2009 -0400 +++ b/ChangeLog Fri May 22 23:35:26 2009 +0100 @@ -1,3 +1,8 @@ 2009-05-22 Lillian Angel + + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: + Define InlineSmallCode, using x86 value to begin with. + 2009-05-22 Lillian Angel * Makefile.am: Fixed typo. diff -r 8070d13626fa -r e160d9e94f4e ports/hotspot/src/cpu/zero/vm/globals_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Fri May 22 13:04:43 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Fri May 22 23:35:26 2009 +0100 @@ -44,6 +44,7 @@ define_pd_global(uintx, NewSize, define_pd_global(uintx, NewSize, ScaleForWordSize(1024 * K)); #endif // _LP64 define_pd_global(intx, InlineFrequencyCount, 100); +define_pd_global(intx, InlineSmallCode, 1000); define_pd_global(intx, PreInflateSpin, 10); define_pd_global(intx, StackYellowPages, 2); From ahughes at redhat.com Fri May 22 16:44:18 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 22 May 2009 23:44:18 +0000 Subject: changeset in /hg/icedtea: Fix ChangeLog attribution. Message-ID: changeset 5744d25c5a37 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5744d25c5a37 description: Fix ChangeLog attribution. diffstat: 1 file changed, 5 insertions(+), 5 deletions(-) ChangeLog | 10 +++++----- diffs (22 lines): diff -r 03cb176986bc -r 5744d25c5a37 ChangeLog --- a/ChangeLog Sat May 23 00:41:28 2009 +0100 +++ b/ChangeLog Sat May 23 00:46:40 2009 +0100 @@ -1,13 +1,13 @@ 2009-05-22 Andrew John Hughes + + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: + Define InlineSmallCode, using x86 value to begin with. + +2009-05-22 Mark Wielaard * patches/xrender/icedtea-002.patch: Correct rebase. Add Java_sun_java2d_x11_XSurfaceData_isDrawableValid and Java_sun_java2d_x11_XSurfaceData_setInvalid back. - -2009-05-22 Mark Wielaard - - * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: - Define InlineSmallCode, using x86 value to begin with. 2009-05-22 Lillian Angel From mark at klomp.org Sat May 23 00:18:44 2009 From: mark at klomp.org (Mark Wielaard) Date: Sat, 23 May 2009 09:18:44 +0200 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <1243015508.3655.123.camel@hermans.wildebeest.org> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> Message-ID: <1243063124.3579.19.camel@hermans.wildebeest.org> On Fri, 2009-05-22 at 20:05 +0200, Mark Wielaard wrote: > Hi Andrew, > > On Fri, 2009-05-22 at 18:35 +0100, Andrew John Hughes wrote: > > Are there any negative side-effects to having this code applied all the time? > > No, the patches are designed so that without the property set the old > pipeline is used. That said, if you do build with --disable-xrender then the font issue doesn't occur. So something else is broken with the xrender support :( I propose that we disable xrender support by default for now while we figure out what else is borked. This is slightly annoying since especially in my current situation (slow X ssh connection to main machine) running with -Dsun.java2d.xrender=True was the only way to make running gui apps somewhat bearable. New test results published: http://icedtea.classpath.org/~mjw/jtreg7/ hotspot: Test results: passed: 35; failed: 1; error: 2 langtools: Test results: passed: 1,475 jdk: Test results: passed: 3,751; failed: 53; error: 3 Still much more failures than I would like, but clearly somewhat better. This time a lot of tests fail with the somewhat mysterious IllegalArgumentException: button doesn't exist 12 Cheers, Mark From mark at klomp.org Sat May 23 14:22:04 2009 From: mark at klomp.org (Mark Wielaard) Date: Sat, 23 May 2009 21:22:04 +0000 Subject: changeset in /hg/icedtea: * Makefile.am (LIVECONNECT_DIR): Add -... Message-ID: changeset dc7d6bc54c98 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dc7d6bc54c98 description: * Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net. (rt-closed.jar): Don't unconditionally add -C lib/rt net. diffstat: 2 files changed, 9 insertions(+), 6 deletions(-) ChangeLog | 5 +++++ Makefile.am | 10 ++++------ diffs (46 lines): diff -r 5744d25c5a37 -r dc7d6bc54c98 ChangeLog --- a/ChangeLog Sat May 23 00:46:40 2009 +0100 +++ b/ChangeLog Sat May 23 23:23:12 2009 +0200 @@ -1,3 +1,8 @@ 2009-05-22 Andrew John Hughes + + * Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net. + (rt-closed.jar): Don't unconditionally add -C lib/rt net. + 2009-05-22 Andrew John Hughes * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: diff -r 5744d25c5a37 -r dc7d6bc54c98 Makefile.am --- a/Makefile.am Sat May 23 00:46:40 2009 +0100 +++ b/Makefile.am Sat May 23 23:23:12 2009 +0200 @@ -26,13 +26,13 @@ ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlu ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch -LIVECONNECT_DIR = -C lib/rt netscape +LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net else if ENABLE_PLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch -LIVECONNECT_DIR = -C lib/rt netscape +LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net else ICEDTEAPLUGIN_CLEAN = ICEDTEAPLUGIN_TARGET = @@ -3073,12 +3073,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAR) cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \ - -C lib/rt net ; \ + -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \ - -C lib/rt net ; \ + -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \ fi if test -d bootstrap/ecj/jre/lib ; \ then \ From mark at klomp.org Sat May 23 14:23:33 2009 From: mark at klomp.org (Mark Wielaard) Date: Sat, 23 May 2009 23:23:33 +0200 Subject: Make --disable-liveconnect build on icedtea7 Message-ID: <1243113813.3579.36.camel@hermans.wildebeest.org> Hi, The lib/rt/net directory is only there with --enable-liveconnect (which is now called --enable-plugin in icedtea6 btw) or --enable-npplugin. So the following patch makes sure it is only included in those cases, otherwise the jar command will fail because it cannot find the directory. 2009-05-23 Mark Wielaard * Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net. (rt-closed.jar): Don't unconditionally add -C lib/rt net. Committed and pushed, Mark diff -r 5744d25c5a37 Makefile.am --- a/Makefile.am Sat May 23 00:46:40 2009 +0100 +++ b/Makefile.am Sat May 23 23:22:12 2009 +0200 @@ -26,13 +26,13 @@ ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch -LIVECONNECT_DIR = -C lib/rt netscape +LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net else if ENABLE_PLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch -LIVECONNECT_DIR = -C lib/rt netscape +LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net else ICEDTEAPLUGIN_CLEAN = ICEDTEAPLUGIN_TARGET = @@ -3073,12 +3073,10 @@ if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAR) cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \ - -C lib/rt net ; \ + -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \ - -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \ - -C lib/rt net ; \ + -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \ fi if test -d bootstrap/ecj/jre/lib ; \ then \ From a.radke at arcor.de Sun May 24 03:01:11 2009 From: a.radke at arcor.de (Andreas Radke) Date: Sun, 24 May 2009 12:01:11 +0200 Subject: IcedTea6-1.5 release branch created In-Reply-To: <4A12A1A9.8050903@redhat.com> References: <4A12A1A9.8050903@redhat.com> Message-ID: <20090524120111.0ee0eeda@workstation64.home> Am Tue, 19 May 2009 08:10:17 -0400 schrieb Lillian Angel : > Hi, > > I have tagged the main repo with the tag "icedtea6-1.5rc3" and > created the release branch here: > http://icedtea.classpath.org/hg/release/icedtea6-1.5 > > Any patches that are required to go into the release branch should be > discussed on list. If they are approved to go in, they must be > applied to both the main branch and the release branch. > > > Cheers, > Lillian > I've used the hg 1.5rc3 tarball and get this build error: ../../../src/solaris/classes/sun/awt/X11/ListHelper.java # Running javac: /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/bootstrap/jdk1.6.0/bin/java -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m -Xbootclasspath/p:/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar -jar /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar -g -source 1.5 -target 5 -encoding ascii -Xbootclasspath:/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/classes -sourcepath /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/gensrc:../../../src/solaris/classes:../../../src/share/classes -d /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/classes @/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/tmp/sun/sun.awt.X11/xawt/.classes.list ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:415: cannot find symbol symbol : variable XAWTIcon32_java_icon16_png location: class sun.awt.X11.XWindowPeer defaultIconInfo.add(new XIconInfo(XAWTIcon32_java_icon16_png.java_icon16_png)); ^ ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:416: cannot find symbol symbol : variable XAWTIcon32_java_icon24_png location: class sun.awt.X11.XWindowPeer defaultIconInfo.add(new XIconInfo(XAWTIcon32_java_icon24_png.java_icon24_png)); ^ ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:417: cannot find symbol symbol : variable XAWTIcon32_java_icon32_png location: class sun.awt.X11.XWindowPeer defaultIconInfo.add(new XIconInfo(XAWTIcon32_java_icon32_png.java_icon32_png)); ^ ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:418: cannot find symbol symbol : variable XAWTIcon32_java_icon48_png location: class sun.awt.X11.XWindowPeer defaultIconInfo.add(new XIconInfo(XAWTIcon32_java_icon48_png.java_icon48_png)); ^ ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:420: cannot find symbol symbol : variable XAWTIcon64_java_icon16_png location: class sun.awt.X11.XWindowPeer defaultIconInfo.add(new XIconInfo(XAWTIcon64_java_icon16_png.java_icon16_png)); ^ ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:421: cannot find symbol symbol : variable XAWTIcon64_java_icon24_png location: class sun.awt.X11.XWindowPeer defaultIconInfo.add(new XIconInfo(XAWTIcon64_java_icon24_png.java_icon24_png)); ^ ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:422: cannot find symbol symbol : variable XAWTIcon64_java_icon32_png location: class sun.awt.X11.XWindowPeer defaultIconInfo.add(new XIconInfo(XAWTIcon64_java_icon32_png.java_icon32_png)); ^ ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:423: cannot find symbol symbol : variable XAWTIcon64_java_icon48_png location: class sun.awt.X11.XWindowPeer defaultIconInfo.add(new XIconInfo(XAWTIcon64_java_icon48_png.java_icon48_png)); ^ Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. Note: Some input files use unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. 8 errors make[4]: *** [.compile.classlist] Error 1 make[4]: Leaving directory `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make/sun/xawt' make[3]: *** [all] Error 1 make[3]: Leaving directory `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make/sun' make[2]: *** [all] Error 1 make[2]: Leaving directory `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make' make[1]: *** [jdk-build] Fehler 2 make[1]: Leaving directory `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk' make: *** [stamps/icedtea.stamp] Fehler 2 ==> FEHLER: Build fehlgeschlagen. Any idea? -Andy ArchLinux package maintainer From mark at klomp.org Sun May 24 05:33:31 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 24 May 2009 14:33:31 +0200 Subject: Make --disable-liveconnect build on icedtea7 In-Reply-To: <1243113813.3579.36.camel@hermans.wildebeest.org> References: <1243113813.3579.36.camel@hermans.wildebeest.org> Message-ID: <1243168412.3729.47.camel@hermans.wildebeest.org> On Sat, 2009-05-23 at 23:23 +0200, Mark Wielaard wrote: > The lib/rt/net directory is only there with --enable-liveconnect (which > is now called --enable-plugin in icedtea6 btw) or --enable-npplugin. So > the following patch makes sure it is only included in those cases, > otherwise the jar command will fail because it cannot find the > directory. > > 2009-05-23 Mark Wielaard > > * Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net. > (rt-closed.jar): Don't unconditionally add -C lib/rt net. But that isn't the whole story. IcedTea7 has diverged a bit from IcedTea6. In IcedTea7 the netx/javaws classes are only compiled when the plugin is enabled. That is not completely correct, since the javaws support is independently useful. Also the Makefile contained a bug in that the jibx files depended on the netx about.jar. This patch fixes that and makes it so that all parts of netx aren't compiled unless a plugin is enabled. 2009-05-24 Mark Wielaard * configure.ac (JNLP_ABOUT_NEEDED): New check. * Makefile.am (JNLP_ABOUT_TARGET): Set to extra-lib/about.jar when needed. (stamps/icedtea.stamp): Depend on JNLP_ABOUT_TARGET. Only copy about.jar and jnlp resources when needed. (stamps/icedtea-debug.stamp): Likewise. (stamps/jibx.stamp): Don't depend on extra-lib/about.jar. This just makes how the plugin/no-plugin compiles against the javaws/netx support consistent. Ultimately it this should be merged with how IcedTea6 does it and build the javaws netx support independently from whether a plugin is enabled. Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: about.patch Type: text/x-patch Size: 3340 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090524/a8eab9ac/about.patch From mark at klomp.org Sun May 24 05:32:40 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 24 May 2009 12:32:40 +0000 Subject: changeset in /hg/icedtea: * Makefile.am (ICEDTEA_PATCHES): Add i... Message-ID: changeset 32178b92a01e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=32178b92a01e description: * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. * patches/icedtea-freetypeversion.patch: New patch. * HACKING: Document new patch. diffstat: 3 files changed, 8 insertions(+) ChangeLog | 6 ++++++ HACKING | 1 + Makefile.am | 1 + diffs (38 lines): diff -r dc7d6bc54c98 -r 32178b92a01e ChangeLog --- a/ChangeLog Sat May 23 23:23:12 2009 +0200 +++ b/ChangeLog Mon May 04 15:37:22 2009 +0200 @@ -470,6 +470,12 @@ 2009-05-01 Matthias Klose + + * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. + * patches/icedtea-freetypeversion.patch: New patch. + * HACKING: Document new patch. 2009-05-04 Mark Wielaard diff -r dc7d6bc54c98 -r 32178b92a01e HACKING --- a/HACKING Sat May 23 23:23:12 2009 +0200 +++ b/HACKING Mon May 04 15:37:22 2009 +0200 @@ -19,6 +19,7 @@ The following patches are currently appl * icedtea-debuginfo.patch: Add -g option to build to generate debugging information. * icedtea-demos.patch: Fix building of JVMTI demo. * icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30) +* icedtea-freetypeversion.patch: freetype backend only requires 2.2.1. * icedtea-fonts.patch: Add Fedora fontconfig. * icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name. * icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649) diff -r dc7d6bc54c98 -r 32178b92a01e Makefile.am --- a/Makefile.am Sat May 23 23:23:12 2009 +0200 +++ b/Makefile.am Mon May 04 15:37:22 2009 +0200 @@ -2003,6 +2003,7 @@ ICEDTEA_PATCHES = \ 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 \ From mark at klomp.org Sun May 24 05:32:41 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 24 May 2009 12:32:41 +0000 Subject: changeset in /hg/icedtea: * configure.ac (JNLP_ABOUT_NEEDED): Ne... Message-ID: changeset c93a65ee7a4f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c93a65ee7a4f description: * configure.ac (JNLP_ABOUT_NEEDED): New check. * Makefile.am (JNLP_ABOUT_TARGET): Set to extra-lib/about.jar when needed. (stamps/icedtea.stamp): Depend on JNLP_ABOUT_TARGET. Only copy about.jar and jnlp resources when needed. (stamps/icedtea-debug.stamp): Likewise. (stamps/jibx.stamp): Don't depend on extra-lib/about.jar. diffstat: 3 files changed, 22 insertions(+), 3 deletions(-) ChangeLog | 10 ++++++++++ Makefile.am | 13 ++++++++++--- configure.ac | 2 ++ diffs (110 lines): diff -r fc4b452e23e1 -r c93a65ee7a4f ChangeLog --- a/ChangeLog Sat May 23 23:44:03 2009 +0200 +++ b/ChangeLog Sun May 24 13:57:17 2009 +0200 @@ -1,3 +1,13 @@ 2009-05-23 Mark Wielaard + + * configure.ac (JNLP_ABOUT_NEEDED): New check. + * Makefile.am (JNLP_ABOUT_TARGET): Set to extra-lib/about.jar + when needed. + (stamps/icedtea.stamp): Depend on JNLP_ABOUT_TARGET. Only copy + about.jar and jnlp resources when needed. + (stamps/icedtea-debug.stamp): Likewise. + (stamps/jibx.stamp): Don't depend on extra-lib/about.jar. + 2009-05-23 Mark Wielaard * Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net. diff -r fc4b452e23e1 -r c93a65ee7a4f Makefile.am --- a/Makefile.am Sat May 23 23:44:03 2009 +0200 +++ b/Makefile.am Sun May 24 13:57:17 2009 +0200 @@ -27,17 +27,20 @@ ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.s ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net +JNLP_ABOUT_TARGET = extra-lib/about.jar else if ENABLE_PLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net +JNLP_ABOUT_TARGET = extra-lib/about.jar else ICEDTEAPLUGIN_CLEAN = ICEDTEAPLUGIN_TARGET = PLUGIN_PATCH = patches/icedtea-plugin.patch LIVECONNECT_DIR = +JNLP_ABOUT_TARGET = endif endif @@ -2651,7 +2654,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \ + $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \ stamps/jibx.stamp stamps/cacao.stamp \ stamps/pulse-java.stamp stamps/visualvm.stamp $(ARCH_PREFIX) $(MAKE) \ @@ -2704,12 +2707,14 @@ if WITH_VISUALVM cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if JNLP_ABOUT_NEEDED cp $(NETX_RESOURCE_DIR)/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib cp $(NETX_RESOURCE_DIR)/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib +endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -2735,7 +2740,7 @@ stamps/icedtea-debug.stamp: stamps/boots stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ - $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \ + $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \ stamps/jibx.stamp stamps/cacao.stamp \ stamps/pulse-java.stamp stamps/visualvm.stamp $(ARCH_PREFIX) $(MAKE) \ @@ -2788,12 +2793,14 @@ if WITH_VISUALVM cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if JNLP_ABOUT_NEEDED cp $(NETX_RESOURCE_DIR)/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib cp $(NETX_RESOURCE_DIR)/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib +endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -3127,7 +3134,7 @@ extra-lib/about.jar: stamps/extra-class- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \ fi -stamps/jibx.stamp: extra-lib/about.jar +stamps/jibx.stamp: if ENABLE_NIMBUS if ENABLE_NIMBUS_GENERATION mkdir $(JIBX_DEPS_DIR) diff -r fc4b452e23e1 -r c93a65ee7a4f configure.ac --- a/configure.ac Sat May 23 23:44:03 2009 +0200 +++ b/configure.ac Sun May 24 13:57:17 2009 +0200 @@ -168,6 +168,8 @@ AC_ARG_ENABLE([npplugin], [enable_npplugin="${enableval}"], [enable_npplugin="no"]) AM_CONDITIONAL(ENABLE_NPPLUGIN, test "x${enable_npplugin}" = "xyes") AC_MSG_RESULT(${enable_npplugin}) + +AM_CONDITIONAL(JNLP_ABOUT_NEEDED, test "x${enable_npplugin}" = "xyes" -o "x${enable_plugin}" = "xyes") AC_MSG_CHECKING([whether to include PulseAudio support]) AC_ARG_ENABLE([pulse-java], From mark at klomp.org Sun May 24 05:32:40 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 24 May 2009 12:32:40 +0000 Subject: changeset in /hg/icedtea: * Makefile.am (ICEDTEA_PATCHES): Add i... Message-ID: changeset fc4b452e23e1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fc4b452e23e1 description: * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. * patches/icedtea-freetypeversion.patch: New patch. * HACKING: Document new patch. diffstat: 1 file changed, 11 insertions(+) patches/icedtea-freetypeversion.patch | 11 +++++++++++ diffs (15 lines): diff -r 32178b92a01e -r fc4b452e23e1 patches/icedtea-freetypeversion.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-freetypeversion.patch Sat May 23 23:44:03 2009 +0200 @@ -0,0 +1,11 @@ +--- openjdk/jdk/make/common/shared/Defs-versions.gmk.orig 2009-05-23 23:41:57.000000000 +0200 ++++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2009-05-23 23:42:04.000000000 +0200 +@@ -192,7 +192,7 @@ + # Generic + REQUIRED_ANT_VER = 1.6.3 + REQUIRED_BOOT_VER = 1.5 +-REQUIRED_FREETYPE_VERSION = 2.3.0 ++REQUIRED_FREETYPE_VERSION = 2.2.1 + REQUIRED_MAKE_VER = 3.78 + REQUIRED_UNZIP_VER = 5.12 + REQUIRED_ZIP_VER = 2.2 From mark at klomp.org Sun May 24 05:34:06 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 24 May 2009 14:34:06 +0200 Subject: Transplant icedtea-freetypeversion.patch to icedtea7 Message-ID: <1243168446.3729.49.camel@hermans.wildebeest.org> Hi, I transplanted this change from icedtea6 to icedtea7 because it is needed to build on older systems: 2009-05-04 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. * patches/icedtea-freetypeversion.patch: New patch. * HACKING: Document new patch. Cheers, Mark From mark at klomp.org Sun May 24 15:46:46 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 24 May 2009 22:46:46 +0000 Subject: changeset in /hg/icedtea: * patches/xrender/icedtea-001.patch: I... Message-ID: changeset 51313371451a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=51313371451a description: * patches/xrender/icedtea-001.patch: Initialize X11SurfaceData implicitly, not explicitly. diffstat: 2 files changed, 23 insertions(+), 13 deletions(-) ChangeLog | 5 +++++ patches/xrender/icedtea-001.patch | 31 ++++++++++++++++++------------- diffs (111 lines): diff -r c93a65ee7a4f -r 51313371451a ChangeLog --- a/ChangeLog Sun May 24 13:57:17 2009 +0200 +++ b/ChangeLog Mon May 25 00:26:26 2009 +0200 @@ -1,3 +1,8 @@ 2009-05-24 Mark Wielaard + + * patches/xrender/icedtea-001.patch: Initialize X11SurfaceData + implicitly, not explicitly. + 2009-05-24 Mark Wielaard * configure.ac (JNLP_ABOUT_NEEDED): New check. diff -r c93a65ee7a4f -r 51313371451a patches/xrender/icedtea-001.patch --- a/patches/xrender/icedtea-001.patch Sun May 24 13:57:17 2009 +0200 +++ b/patches/xrender/icedtea-001.patch Mon May 25 00:26:26 2009 +0200 @@ -185,8 +185,9 @@ diff -Nru openjdk.orig/jdk/src/solaris/c } } diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-05-13 00:06:49.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-05-13 01:02:29.000000000 +0100 +diff -r 827a93c4d06a src/solaris/classes/sun/awt/X11GraphicsEnvironment.java +--- openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java Thu May 14 10:58:07 2009 -0700 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java Sun May 24 22:35:35 2009 +0200 @@ -48,9 +48,9 @@ import sun.font.Font2D; import sun.font.FontManager; @@ -200,7 +201,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c /** * This is an implementation of a GraphicsEnvironment object for the -@@ -175,19 +175,43 @@ +@@ -175,19 +175,45 @@ "pipeline (GLX 1.3 not available)"); } } @@ -222,7 +223,9 @@ diff -Nru openjdk.orig/jdk/src/solaris/c + XRSurfaceData.initXRSurfaceData(); + }else + { -+ X11SurfaceData.initX11SurfaceData(); ++ // X11SurfaceData.initX11SurfaceData(); ++ // Don't initialize here the X11SurfaceData ++ // static initializer will do it for us later. + } } - @@ -248,7 +251,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c private static native boolean initGLX(); -@@ -198,6 +222,15 @@ +@@ -198,6 +224,15 @@ public static boolean isGLXVerbose() { return glxVerbose; } @@ -264,7 +267,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c /** * Checks if Shared Memory extension can be used. -@@ -1119,4 +1152,14 @@ +@@ -1119,4 +1154,14 @@ public void paletteChanged() { } @@ -365,8 +368,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c } } diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2009-05-13 00:06:49.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2009-05-13 01:02:29.000000000 +0100 +--- openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java Thu May 14 10:58:07 2009 -0700 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java Sun May 24 22:35:22 2009 +0200 @@ -42,10 +42,7 @@ import java.awt.image.Raster; import java.awt.peer.ComponentPeer; @@ -388,11 +391,13 @@ diff -Nru openjdk.orig/jdk/src/solaris/c protected native void initSurface(int depth, int width, int height, long drawable); native boolean isDrawableValid(); -@@ -199,7 +196,10 @@ - protected static TextPipe x11textpipe; +@@ -200,6 +197,13 @@ protected static boolean dgaAvailable; -- static { + static { ++ initX11SurfaceData(); ++ } ++ + public static void initX11SurfaceData() + { + if(!X11GraphicsEnvironment.isX11SurfaceDataInitialized()) @@ -400,7 +405,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c if (!GraphicsEnvironment.isHeadless()) { // If a screen magnifier is present, don't attempt to use DGA String magPresent = (String) java.security.AccessController.doPrivileged -@@ -233,9 +233,12 @@ +@@ -233,9 +237,12 @@ X11PMBlitLoops.register(); X11PMBlitBgLoops.register(); } @@ -415,7 +420,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c /** * Returns true if we can use DGA on any of the screens */ -@@ -631,7 +634,7 @@ +@@ -632,7 +639,7 @@ { // assert SunToolkit.isAWTLockHeldByCurrentThread(); From mark at klomp.org Sun May 24 15:48:04 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 25 May 2009 00:48:04 +0200 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <1243063124.3579.19.camel@hermans.wildebeest.org> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> <1243063124.3579.19.camel@hermans.wildebeest.org> Message-ID: <1243205284.30320.15.camel@hermans.wildebeest.org> On Sat, 2009-05-23 at 09:18 +0200, Mark Wielaard wrote: > On Fri, 2009-05-22 at 20:05 +0200, Mark Wielaard wrote: > > On Fri, 2009-05-22 at 18:35 +0100, Andrew John Hughes wrote: > > > Are there any negative side-effects to having this code applied all the time? > > > > No, the patches are designed so that without the property set the old > > pipeline is used. > > That said, if you do build with --disable-xrender then the font issue > doesn't occur. So something else is broken with the xrender support :( > I propose that we disable xrender support by default for now while we > figure out what else is borked. Found it. The X11 pipeline initialization is a bit tricky to follow. The xrender patches tried to clear that up at one point by making the initialization of the X11SurfaceData explicit (just like the XRSurfaceData). Although that code is nicer and cleaner, the new font code depends on the implicit static initializer calling order. That is a bit yucky, but lets play along and make sure that no explicit initialization is done: 2009-05-24 Mark Wielaard * patches/xrender/icedtea-001.patch: Initialize X11SurfaceData implicitly, not explicitly. Now both the standard X11 pipeline (default) and the XRender pipeline (-Dsun.java2d.xrender=True) work again against IcedTea7. Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: xrender-implicit-init.patch Type: text/x-patch Size: 3940 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090525/daab2d5f/xrender-implicit-init.patch From mark at klomp.org Mon May 25 01:06:59 2009 From: mark at klomp.org (Mark Wielaard) Date: Mon, 25 May 2009 10:06:59 +0200 Subject: latest icedtea7 make check results Message-ID: <1243238819.5395.6.camel@hermans.wildebeest.org> Hi, After all the patches this weekend I did a clean run: ./configure && make && make check -k (On an Fedora 11/Rawhide x86_64 system) hotspot: Test results: passed: 35; failed: 1; error: 2 langtools: Test results: passed: 1,475 jdk: Test results: passed: 3,748; failed: 55; error: 4 Attached is the jtreg-summary.log. Full results uploaded at http://icedtea.classpath.org/~mjw/jtreg7/ I believe some of the remaining failures already have fixes in icedtea6, but I didn't investigate much yet. Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: jtreg-summary.log Type: text/x-log Size: 4085 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090525/971ca461/jtreg-summary.log From thebohemian at gmx.net Mon May 25 01:37:40 2009 From: thebohemian at gmx.net (Robert Schuster) Date: Mon, 25 May 2009 10:37:40 +0200 Subject: [patch] Re: changeset in /hg/icedtea6: 2009-05-18 Robert Schuster References: <4A15DF7D.9000603@zafena.se> Message-ID: <4A1A58D4.3010706@gmx.net> Hi Xerxes, Xerxes R?nby schrieb: > to see the default rules of make: > make -p -l | grep LINK.c > LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) > > The attaches patch renames TARGET_ARCH to CROSS_TARGET_ARCH in order to > prevent this unintended use by the built in LINK.c make rule. Thanks for finding this! The reason why this could have slipped in is that in an earlier iteration the name of the variable was OE_UNAME_M and that did not clash with the built-in LINK.c variable. I did not expect that a name change could result in such a problem. I very much welcome the proposed patch! 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/20090525/7d176b22/signature.asc From xerxes at zafena.se Mon May 25 03:38:53 2009 From: xerxes at zafena.se (Xerxes R?nby) Date: Mon, 25 May 2009 10:38:53 +0000 Subject: changeset in /hg/icedtea6: 2009-05-25 Xerxes R?nby changeset 4501bcea5ffd in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4501bcea5ffd description: 2009-05-25 Xerxes R?nby * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH to prevent unintended use by make builtin LINK.c rule. * Makefile.am: Likewise. * patches/icedtea-explicit-target-arch.patch: Likewise. diffstat: 4 files changed, 24 insertions(+), 17 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 4 ++-- acinclude.m4 | 24 ++++++++++++------------ patches/icedtea-explicit-target-arch.patch | 6 +++--- diffs (158 lines): diff -r fd613af504b2 -r 4501bcea5ffd ChangeLog --- a/ChangeLog Fri May 22 10:13:16 2009 -0400 +++ b/ChangeLog Mon May 25 12:40:45 2009 +0200 @@ -1,3 +1,10 @@ 2009-05-22 Omair Majid + + * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH + to prevent unintended use by make builtin LINK.c rule. + * Makefile.am: Likewise. + * patches/icedtea-explicit-target-arch.patch: Likewise. + 2009-05-22 Omair Majid * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to reflect diff -r fd613af504b2 -r 4501bcea5ffd Makefile.am --- a/Makefile.am Fri May 22 10:13:16 2009 -0400 +++ b/Makefile.am Mon May 25 12:40:45 2009 +0200 @@ -202,7 +202,7 @@ if ENABLE_CROSS_COMPILATION if ENABLE_CROSS_COMPILATION ICEDTEA_ENV += \ CROSS_COMPILATION="true" \ - TARGET_ARCH="$(TARGET_ARCH)" + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)" endif if USE_ALT_JAR @@ -285,7 +285,7 @@ if ENABLE_CROSS_COMPILATION if ENABLE_CROSS_COMPILATION ICEDTEA_ENV_ECJ += \ CROSS_COMPILATION="true" \ - TARGET_ARCH="$(TARGET_ARCH)" + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)" endif env-ecj: diff -r fd613af504b2 -r 4501bcea5ffd acinclude.m4 --- a/acinclude.m4 Fri May 22 10:13:16 2009 -0400 +++ b/acinclude.m4 Mon May 25 12:40:45 2009 +0200 @@ -5,77 +5,77 @@ AC_DEFUN([SET_ARCH_DIRS], BUILD_ARCH_DIR=amd64 INSTALL_ARCH_DIR=amd64 JRE_ARCH_DIR=amd64 - TARGET_ARCH=x86_64 + CROSS_TARGET_ARCH=x86_64 ;; i?86-*-*) BUILD_ARCH_DIR=i586 INSTALL_ARCH_DIR=i386 JRE_ARCH_DIR=i386 ARCH_PREFIX=${LINUX32} - TARGET_ARCH=i386 + CROSS_TARGET_ARCH=i386 ;; alpha*-*-*) BUILD_ARCH_DIR=alpha INSTALL_ARCH_DIR=alpha JRE_ARCH_DIR=alpha - TARGET_ARCH=alpha + CROSS_TARGET_ARCH=alpha ;; arm*-*-*) BUILD_ARCH_DIR=arm INSTALL_ARCH_DIR=arm JRE_ARCH_DIR=arm - TARGET_ARCH=arm + CROSS_TARGET_ARCH=arm ;; mips-*-*) BUILD_ARCH_DIR=mips INSTALL_ARCH_DIR=mips JRE_ARCH_DIR=mips - TARGET_ARCH=mips + CROSS_TARGET_ARCH=mips ;; mipsel-*-*) BUILD_ARCH_DIR=mipsel INSTALL_ARCH_DIR=mipsel JRE_ARCH_DIR=mipsel - TARGET_ARCH=mipsel + CROSS_TARGET_ARCH=mipsel ;; powerpc-*-*) BUILD_ARCH_DIR=ppc INSTALL_ARCH_DIR=ppc JRE_ARCH_DIR=ppc ARCH_PREFIX=${LINUX32} - TARGET_ARCH=ppc + CROSS_TARGET_ARCH=ppc ;; powerpc64-*-*) BUILD_ARCH_DIR=ppc64 INSTALL_ARCH_DIR=ppc64 JRE_ARCH_DIR=ppc64 - TARGET_ARCH=ppc64 + CROSS_TARGET_ARCH=ppc64 ;; sparc64-*-*) BUILD_ARCH_DIR=sparcv9 INSTALL_ARCH_DIR=sparcv9 JRE_ARCH_DIR=sparc64 - TARGET_ARCH=sparc64 + CROSS_TARGET_ARCH=sparc64 ;; s390-*-*) BUILD_ARCH_DIR=s390 INSTALL_ARCH_DIR=s390 JRE_ARCH_DIR=s390 ARCH_PREFIX=${LINUX32} - TARGET_ARCH=s390 + CROSS_TARGET_ARCH=s390 ;; *) BUILD_ARCH_DIR=`uname -m` INSTALL_ARCH_DIR=$BUILD_ARCH_DIR JRE_ARCH_DIR=$INSTALL_ARCH_DIR - TARGET_ARCH=$BUILD_ARCH_DIR + CROSS_TARGET_ARCH=$BUILD_ARCH_DIR ;; esac AC_SUBST(BUILD_ARCH_DIR) AC_SUBST(INSTALL_ARCH_DIR) AC_SUBST(JRE_ARCH_DIR) AC_SUBST(ARCH_PREFIX) - AC_SUBST(TARGET_ARCH) + AC_SUBST(CROSS_TARGET_ARCH) ]) AC_DEFUN([SET_OS_DIRS], diff -r fd613af504b2 -r 4501bcea5ffd patches/icedtea-explicit-target-arch.patch --- a/patches/icedtea-explicit-target-arch.patch Fri May 22 10:13:16 2009 -0400 +++ b/patches/icedtea-explicit-target-arch.patch Mon May 25 12:40:45 2009 +0200 @@ -16,7 +16,7 @@ Index: openjdk/hotspot/make/linux/makefi +ifndef CROSS_COMPILATION + ARCH:=$(shell uname -m) +else -+ ARCH:=$(TARGET_ARCH) ++ ARCH:=$(CROSS_TARGET_ARCH) +endif PATH_SEP = : ifeq ($(LP64), 1) @@ -38,7 +38,7 @@ Index: openjdk/jdk/make/common/shared/Pl + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + endif + else -+ mach := $(TARGET_ARCH) ++ mach := $(CROSS_TARGET_ARCH) endif archExpr = case "$(mach)" in \ i[3-9]86) \ @@ -62,7 +62,7 @@ Index: openjdk/corba/make/common/shared/ + endif + else + # Cross-compilation: Assume target archicture is given. -+ mach := $(TARGET_ARCH) ++ mach := $(CROSS_TARGET_ARCH) endif archExpr = case "$(mach)" in \ i[3-9]86) \ From xerxes at zafena.se Mon May 25 03:50:53 2009 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 25 May 2009 12:50:53 +0200 Subject: changeset in /hg/icedtea6: 2009-05-25 Xerxes R?nby References: Message-ID: <4A1A780D.8040200@zafena.se> Hi, Ok to apply this to the icedtea6-1.5 branch? Xerxes Xerxes R?nby skrev: > changeset 4501bcea5ffd in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4501bcea5ffd > description: > 2009-05-25 Xerxes R?nby > > * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH > to prevent unintended use by make builtin LINK.c rule. > * Makefile.am: Likewise. > * patches/icedtea-explicit-target-arch.patch: Likewise. > > diffstat: > > 4 files changed, 24 insertions(+), 17 deletions(-) > ChangeLog | 7 +++++++ > Makefile.am | 4 ++-- > acinclude.m4 | 24 ++++++++++++------------ > patches/icedtea-explicit-target-arch.patch | 6 +++--- > > diffs (158 lines): > > diff -r fd613af504b2 -r 4501bcea5ffd ChangeLog > --- a/ChangeLog Fri May 22 10:13:16 2009 -0400 > +++ b/ChangeLog Mon May 25 12:40:45 2009 +0200 > @@ -1,3 +1,10 @@ 2009-05-22 Omair Majid +2009-05-25 Xerxes R?nby > + > + * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH > + to prevent unintended use by make builtin LINK.c rule. > + * Makefile.am: Likewise. > + * patches/icedtea-explicit-target-arch.patch: Likewise. > + > 2009-05-22 Omair Majid > > * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to reflect > diff -r fd613af504b2 -r 4501bcea5ffd Makefile.am > --- a/Makefile.am Fri May 22 10:13:16 2009 -0400 > +++ b/Makefile.am Mon May 25 12:40:45 2009 +0200 > @@ -202,7 +202,7 @@ if ENABLE_CROSS_COMPILATION > if ENABLE_CROSS_COMPILATION > ICEDTEA_ENV += \ > CROSS_COMPILATION="true" \ > - TARGET_ARCH="$(TARGET_ARCH)" > + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)" > endif > > if USE_ALT_JAR > @@ -285,7 +285,7 @@ if ENABLE_CROSS_COMPILATION > if ENABLE_CROSS_COMPILATION > ICEDTEA_ENV_ECJ += \ > CROSS_COMPILATION="true" \ > - TARGET_ARCH="$(TARGET_ARCH)" > + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)" > endif > > env-ecj: > diff -r fd613af504b2 -r 4501bcea5ffd acinclude.m4 > --- a/acinclude.m4 Fri May 22 10:13:16 2009 -0400 > +++ b/acinclude.m4 Mon May 25 12:40:45 2009 +0200 > @@ -5,77 +5,77 @@ AC_DEFUN([SET_ARCH_DIRS], > BUILD_ARCH_DIR=amd64 > INSTALL_ARCH_DIR=amd64 > JRE_ARCH_DIR=amd64 > - TARGET_ARCH=x86_64 > + CROSS_TARGET_ARCH=x86_64 > ;; > i?86-*-*) > BUILD_ARCH_DIR=i586 > INSTALL_ARCH_DIR=i386 > JRE_ARCH_DIR=i386 > ARCH_PREFIX=${LINUX32} > - TARGET_ARCH=i386 > + CROSS_TARGET_ARCH=i386 > ;; > alpha*-*-*) > BUILD_ARCH_DIR=alpha > INSTALL_ARCH_DIR=alpha > JRE_ARCH_DIR=alpha > - TARGET_ARCH=alpha > + CROSS_TARGET_ARCH=alpha > ;; > arm*-*-*) > BUILD_ARCH_DIR=arm > INSTALL_ARCH_DIR=arm > JRE_ARCH_DIR=arm > - TARGET_ARCH=arm > + CROSS_TARGET_ARCH=arm > ;; > mips-*-*) > BUILD_ARCH_DIR=mips > INSTALL_ARCH_DIR=mips > JRE_ARCH_DIR=mips > - TARGET_ARCH=mips > + CROSS_TARGET_ARCH=mips > ;; > mipsel-*-*) > BUILD_ARCH_DIR=mipsel > INSTALL_ARCH_DIR=mipsel > JRE_ARCH_DIR=mipsel > - TARGET_ARCH=mipsel > + CROSS_TARGET_ARCH=mipsel > ;; > powerpc-*-*) > BUILD_ARCH_DIR=ppc > INSTALL_ARCH_DIR=ppc > JRE_ARCH_DIR=ppc > ARCH_PREFIX=${LINUX32} > - TARGET_ARCH=ppc > + CROSS_TARGET_ARCH=ppc > ;; > powerpc64-*-*) > BUILD_ARCH_DIR=ppc64 > INSTALL_ARCH_DIR=ppc64 > JRE_ARCH_DIR=ppc64 > - TARGET_ARCH=ppc64 > + CROSS_TARGET_ARCH=ppc64 > ;; > sparc64-*-*) > BUILD_ARCH_DIR=sparcv9 > INSTALL_ARCH_DIR=sparcv9 > JRE_ARCH_DIR=sparc64 > - TARGET_ARCH=sparc64 > + CROSS_TARGET_ARCH=sparc64 > ;; > s390-*-*) > BUILD_ARCH_DIR=s390 > INSTALL_ARCH_DIR=s390 > JRE_ARCH_DIR=s390 > ARCH_PREFIX=${LINUX32} > - TARGET_ARCH=s390 > + CROSS_TARGET_ARCH=s390 > ;; > *) > BUILD_ARCH_DIR=`uname -m` > INSTALL_ARCH_DIR=$BUILD_ARCH_DIR > JRE_ARCH_DIR=$INSTALL_ARCH_DIR > - TARGET_ARCH=$BUILD_ARCH_DIR > + CROSS_TARGET_ARCH=$BUILD_ARCH_DIR > ;; > esac > AC_SUBST(BUILD_ARCH_DIR) > AC_SUBST(INSTALL_ARCH_DIR) > AC_SUBST(JRE_ARCH_DIR) > AC_SUBST(ARCH_PREFIX) > - AC_SUBST(TARGET_ARCH) > + AC_SUBST(CROSS_TARGET_ARCH) > ]) > > AC_DEFUN([SET_OS_DIRS], > diff -r fd613af504b2 -r 4501bcea5ffd patches/icedtea-explicit-target-arch.patch > --- a/patches/icedtea-explicit-target-arch.patch Fri May 22 10:13:16 2009 -0400 > +++ b/patches/icedtea-explicit-target-arch.patch Mon May 25 12:40:45 2009 +0200 > @@ -16,7 +16,7 @@ Index: openjdk/hotspot/make/linux/makefi > +ifndef CROSS_COMPILATION > + ARCH:=$(shell uname -m) > +else > -+ ARCH:=$(TARGET_ARCH) > ++ ARCH:=$(CROSS_TARGET_ARCH) > +endif > PATH_SEP = : > ifeq ($(LP64), 1) > @@ -38,7 +38,7 @@ Index: openjdk/jdk/make/common/shared/Pl > + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') > + endif > + else > -+ mach := $(TARGET_ARCH) > ++ mach := $(CROSS_TARGET_ARCH) > endif > archExpr = case "$(mach)" in \ > i[3-9]86) \ > @@ -62,7 +62,7 @@ Index: openjdk/corba/make/common/shared/ > + endif > + else > + # Cross-compilation: Assume target archicture is given. > -+ mach := $(TARGET_ARCH) > ++ mach := $(CROSS_TARGET_ARCH) > endif > archExpr = case "$(mach)" in \ > i[3-9]86) \ > From langel at redhat.com Mon May 25 05:03:07 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 25 May 2009 08:03:07 -0400 Subject: changeset in /hg/icedtea6: 2009-05-25 Xerxes R?nby References: <4A1A780D.8040200@zafena.se> Message-ID: <4A1A88FB.2060405@redhat.com> Xerxes R?nby wrote: > > Hi, > > Ok to apply this to the icedtea6-1.5 branch? We are just at the end of our testing, as I am sure a lot of people are. Mind if we leave this out? Unless it is crucial to get in. Thanks, Lillian > > Xerxes > > Xerxes R?nby skrev: >> changeset 4501bcea5ffd in /hg/icedtea6 >> details: >> http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4501bcea5ffd >> description: >> 2009-05-25 Xerxes R?nby >> >> * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH >> to prevent unintended use by make builtin LINK.c rule. >> * Makefile.am: Likewise. >> * patches/icedtea-explicit-target-arch.patch: Likewise. >> >> diffstat: >> >> 4 files changed, 24 insertions(+), 17 deletions(-) >> ChangeLog | 7 +++++++ >> Makefile.am | 4 ++-- >> acinclude.m4 | 24 >> ++++++++++++------------ >> patches/icedtea-explicit-target-arch.patch | 6 +++--- >> >> diffs (158 lines): >> >> diff -r fd613af504b2 -r 4501bcea5ffd ChangeLog >> --- a/ChangeLog Fri May 22 10:13:16 2009 -0400 >> +++ b/ChangeLog Mon May 25 12:40:45 2009 +0200 >> @@ -1,3 +1,10 @@ 2009-05-22 Omair Majid > +2009-05-25 Xerxes R?nby >> + >> + * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH >> + to prevent unintended use by make builtin LINK.c rule. >> + * Makefile.am: Likewise. >> + * patches/icedtea-explicit-target-arch.patch: Likewise. >> + >> 2009-05-22 Omair Majid >> >> * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to >> reflect diff -r fd613af504b2 -r 4501bcea5ffd Makefile.am >> --- a/Makefile.am Fri May 22 10:13:16 2009 -0400 >> +++ b/Makefile.am Mon May 25 12:40:45 2009 +0200 >> @@ -202,7 +202,7 @@ if ENABLE_CROSS_COMPILATION >> if ENABLE_CROSS_COMPILATION >> ICEDTEA_ENV += \ >> CROSS_COMPILATION="true" \ >> - TARGET_ARCH="$(TARGET_ARCH)" >> + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)" >> endif >> >> if USE_ALT_JAR >> @@ -285,7 +285,7 @@ if ENABLE_CROSS_COMPILATION >> if ENABLE_CROSS_COMPILATION >> ICEDTEA_ENV_ECJ += \ >> CROSS_COMPILATION="true" \ >> - TARGET_ARCH="$(TARGET_ARCH)" >> + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)" >> endif >> >> env-ecj: >> diff -r fd613af504b2 -r 4501bcea5ffd acinclude.m4 >> --- a/acinclude.m4 Fri May 22 10:13:16 2009 -0400 >> +++ b/acinclude.m4 Mon May 25 12:40:45 2009 +0200 >> @@ -5,77 +5,77 @@ AC_DEFUN([SET_ARCH_DIRS], >> BUILD_ARCH_DIR=amd64 >> INSTALL_ARCH_DIR=amd64 >> JRE_ARCH_DIR=amd64 >> - TARGET_ARCH=x86_64 >> + CROSS_TARGET_ARCH=x86_64 >> ;; >> i?86-*-*) >> BUILD_ARCH_DIR=i586 >> INSTALL_ARCH_DIR=i386 >> JRE_ARCH_DIR=i386 >> ARCH_PREFIX=${LINUX32} >> - TARGET_ARCH=i386 >> + CROSS_TARGET_ARCH=i386 >> ;; >> alpha*-*-*) >> BUILD_ARCH_DIR=alpha >> INSTALL_ARCH_DIR=alpha >> JRE_ARCH_DIR=alpha >> - TARGET_ARCH=alpha >> + CROSS_TARGET_ARCH=alpha >> ;; >> arm*-*-*) >> BUILD_ARCH_DIR=arm >> INSTALL_ARCH_DIR=arm >> JRE_ARCH_DIR=arm >> - TARGET_ARCH=arm >> + CROSS_TARGET_ARCH=arm >> ;; >> mips-*-*) >> BUILD_ARCH_DIR=mips >> INSTALL_ARCH_DIR=mips >> JRE_ARCH_DIR=mips >> - TARGET_ARCH=mips >> + CROSS_TARGET_ARCH=mips >> ;; >> mipsel-*-*) >> BUILD_ARCH_DIR=mipsel >> INSTALL_ARCH_DIR=mipsel >> JRE_ARCH_DIR=mipsel >> - TARGET_ARCH=mipsel >> + CROSS_TARGET_ARCH=mipsel >> ;; >> powerpc-*-*) >> BUILD_ARCH_DIR=ppc >> INSTALL_ARCH_DIR=ppc >> JRE_ARCH_DIR=ppc >> ARCH_PREFIX=${LINUX32} >> - TARGET_ARCH=ppc >> + CROSS_TARGET_ARCH=ppc >> ;; >> powerpc64-*-*) >> BUILD_ARCH_DIR=ppc64 >> INSTALL_ARCH_DIR=ppc64 >> JRE_ARCH_DIR=ppc64 >> - TARGET_ARCH=ppc64 >> + CROSS_TARGET_ARCH=ppc64 >> ;; >> sparc64-*-*) >> BUILD_ARCH_DIR=sparcv9 >> INSTALL_ARCH_DIR=sparcv9 >> JRE_ARCH_DIR=sparc64 >> - TARGET_ARCH=sparc64 >> + CROSS_TARGET_ARCH=sparc64 >> ;; >> s390-*-*) >> BUILD_ARCH_DIR=s390 >> INSTALL_ARCH_DIR=s390 >> JRE_ARCH_DIR=s390 >> ARCH_PREFIX=${LINUX32} >> - TARGET_ARCH=s390 >> + CROSS_TARGET_ARCH=s390 >> ;; >> *) >> BUILD_ARCH_DIR=`uname -m` >> INSTALL_ARCH_DIR=$BUILD_ARCH_DIR >> JRE_ARCH_DIR=$INSTALL_ARCH_DIR >> - TARGET_ARCH=$BUILD_ARCH_DIR >> + CROSS_TARGET_ARCH=$BUILD_ARCH_DIR >> ;; >> esac >> AC_SUBST(BUILD_ARCH_DIR) >> AC_SUBST(INSTALL_ARCH_DIR) >> AC_SUBST(JRE_ARCH_DIR) >> AC_SUBST(ARCH_PREFIX) >> - AC_SUBST(TARGET_ARCH) >> + AC_SUBST(CROSS_TARGET_ARCH) >> ]) >> >> AC_DEFUN([SET_OS_DIRS], >> diff -r fd613af504b2 -r 4501bcea5ffd >> patches/icedtea-explicit-target-arch.patch >> --- a/patches/icedtea-explicit-target-arch.patch Fri May 22 >> 10:13:16 2009 -0400 >> +++ b/patches/icedtea-explicit-target-arch.patch Mon May 25 >> 12:40:45 2009 +0200 >> @@ -16,7 +16,7 @@ Index: openjdk/hotspot/make/linux/makefi >> +ifndef CROSS_COMPILATION >> + ARCH:=$(shell uname -m) >> +else >> -+ ARCH:=$(TARGET_ARCH) >> ++ ARCH:=$(CROSS_TARGET_ARCH) >> +endif >> PATH_SEP = : >> ifeq ($(LP64), 1) >> @@ -38,7 +38,7 @@ Index: openjdk/jdk/make/common/shared/Pl >> + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU >> 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') >> + endif >> + else >> -+ mach := $(TARGET_ARCH) >> ++ mach := $(CROSS_TARGET_ARCH) >> endif >> archExpr = case "$(mach)" in \ >> i[3-9]86) \ >> @@ -62,7 +62,7 @@ Index: openjdk/corba/make/common/shared/ >> + endif >> + else >> + # Cross-compilation: Assume target archicture is given. >> -+ mach := $(TARGET_ARCH) >> ++ mach := $(CROSS_TARGET_ARCH) >> endif >> archExpr = case "$(mach)" in \ >> i[3-9]86) \ >> > From langel at redhat.com Mon May 25 05:08:28 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 25 May 2009 08:08:28 -0400 Subject: IcedTea6-1.5 release branch created In-Reply-To: <20090524120111.0ee0eeda@workstation64.home> References: <4A12A1A9.8050903@redhat.com> <20090524120111.0ee0eeda@workstation64.home> Message-ID: <4A1A8A3C.7000701@redhat.com> Andreas Radke wrote: > Am Tue, 19 May 2009 08:10:17 -0400 > schrieb Lillian Angel : > > >> Hi, >> >> I have tagged the main repo with the tag "icedtea6-1.5rc3" and >> created the release branch here: >> http://icedtea.classpath.org/hg/release/icedtea6-1.5 >> >> Any patches that are required to go into the release branch should be >> discussed on list. If they are approved to go in, they must be >> applied to both the main branch and the release branch. >> >> >> Cheers, >> Lillian >> >> > > I've used the hg 1.5rc3 tarball and get this build error: > > ../../../src/solaris/classes/sun/awt/X11/ListHelper.java > # Running javac: > /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/bootstrap/jdk1.6.0/bin/java -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m -Xbootclasspath/p:/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar -jar /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar -g -source 1.5 -target 5 -encoding ascii -Xbootclasspath:/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/classes -sourcepath /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/gensrc:../../../src/solaris/classes:../../../src/share/classes -d /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/classes @/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/tmp/sun/sun.awt.X11/xawt/.classes.list > ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:415: cannot find symbol > symbol : variable XAWTIcon32_java_icon16_png > location: class sun.awt.X11.XWindowPeer > defaultIconInfo.add(new XIconInfo(XAWTIcon32_java_icon16_png.java_icon16_png)); > ^ > ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:416: cannot find symbol > symbol : variable XAWTIcon32_java_icon24_png > location: class sun.awt.X11.XWindowPeer > defaultIconInfo.add(new XIconInfo(XAWTIcon32_java_icon24_png.java_icon24_png)); > ^ > ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:417: cannot find symbol > symbol : variable XAWTIcon32_java_icon32_png > location: class sun.awt.X11.XWindowPeer > defaultIconInfo.add(new XIconInfo(XAWTIcon32_java_icon32_png.java_icon32_png)); > ^ > ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:418: cannot find symbol > symbol : variable XAWTIcon32_java_icon48_png > location: class sun.awt.X11.XWindowPeer > defaultIconInfo.add(new XIconInfo(XAWTIcon32_java_icon48_png.java_icon48_png)); > ^ > ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:420: cannot find symbol > symbol : variable XAWTIcon64_java_icon16_png > location: class sun.awt.X11.XWindowPeer > defaultIconInfo.add(new XIconInfo(XAWTIcon64_java_icon16_png.java_icon16_png)); > ^ > ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:421: cannot find symbol > symbol : variable XAWTIcon64_java_icon24_png > location: class sun.awt.X11.XWindowPeer > defaultIconInfo.add(new XIconInfo(XAWTIcon64_java_icon24_png.java_icon24_png)); > ^ > ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:422: cannot find symbol > symbol : variable XAWTIcon64_java_icon32_png > location: class sun.awt.X11.XWindowPeer > defaultIconInfo.add(new XIconInfo(XAWTIcon64_java_icon32_png.java_icon32_png)); > ^ > ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:423: cannot find symbol > symbol : variable XAWTIcon64_java_icon48_png > location: class sun.awt.X11.XWindowPeer > defaultIconInfo.add(new XIconInfo(XAWTIcon64_java_icon48_png.java_icon48_png)); > ^ > Note: Some input files use or override a deprecated API. > Note: Recompile with -Xlint:deprecation for details. > Note: Some input files use unchecked or unsafe operations. > Note: Recompile with -Xlint:unchecked for details. > 8 errors > make[4]: *** [.compile.classlist] Error 1 > make[4]: Leaving directory `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make/sun/xawt' > make[3]: *** [all] Error 1 > make[3]: Leaving directory `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make/sun' > make[2]: *** [all] Error 1 > make[2]: Leaving directory `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make' > make[1]: *** [jdk-build] Fehler 2 > make[1]: Leaving directory `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk' > make: *** [stamps/icedtea.stamp] Fehler 2 > ==> FEHLER: Build fehlgeschlagen. > > > Any idea? What configure options are you using? I cannot reproduce it with mine. Cheers, Lillian From langel at redhat.com Mon May 25 05:25:47 2009 From: langel at redhat.com (Lillian Angel) Date: Mon, 25 May 2009 08:25:47 -0400 Subject: changeset in /hg/icedtea6: 2009-05-25 Xerxes R?nby References: <4A1A780D.8040200@zafena.se> <4A1A88FB.2060405@redhat.com> Message-ID: <4A1A8E4B.60702@redhat.com> Lillian Angel wrote: > Xerxes R?nby wrote: >> >> Hi, >> >> Ok to apply this to the icedtea6-1.5 branch? > > We are just at the end of our testing, as I am sure a lot of people > are. Mind if we leave this out? Unless it is crucial to get in. I just read the thread you forwarded to me. Please go ahead and apply it to the release branch, since this option is not set by default. Cheers > > > Thanks, > Lillian > >> >> Xerxes >> >> Xerxes R?nby skrev: >>> changeset 4501bcea5ffd in /hg/icedtea6 >>> details: >>> http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4501bcea5ffd >>> >>> description: >>> 2009-05-25 Xerxes R?nby >>> >>> * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH >>> to prevent unintended use by make builtin LINK.c rule. >>> * Makefile.am: Likewise. >>> * patches/icedtea-explicit-target-arch.patch: Likewise. >>> >>> diffstat: >>> >>> 4 files changed, 24 insertions(+), 17 deletions(-) >>> ChangeLog | 7 +++++++ >>> Makefile.am | 4 ++-- >>> acinclude.m4 | 24 >>> ++++++++++++------------ >>> patches/icedtea-explicit-target-arch.patch | 6 +++--- >>> >>> diffs (158 lines): >>> >>> diff -r fd613af504b2 -r 4501bcea5ffd ChangeLog >>> --- a/ChangeLog Fri May 22 10:13:16 2009 -0400 >>> +++ b/ChangeLog Mon May 25 12:40:45 2009 +0200 >>> @@ -1,3 +1,10 @@ 2009-05-22 Omair Majid >> +2009-05-25 Xerxes R?nby >>> + >>> + * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH >>> + to prevent unintended use by make builtin LINK.c rule. >>> + * Makefile.am: Likewise. >>> + * patches/icedtea-explicit-target-arch.patch: Likewise. >>> + >>> 2009-05-22 Omair Majid >>> >>> * rt/net/sourceforge/jnlp/JNLPFile.java (parse): Fix comment to >>> reflect diff -r fd613af504b2 -r 4501bcea5ffd Makefile.am >>> --- a/Makefile.am Fri May 22 10:13:16 2009 -0400 >>> +++ b/Makefile.am Mon May 25 12:40:45 2009 +0200 >>> @@ -202,7 +202,7 @@ if ENABLE_CROSS_COMPILATION >>> if ENABLE_CROSS_COMPILATION >>> ICEDTEA_ENV += \ >>> CROSS_COMPILATION="true" \ >>> - TARGET_ARCH="$(TARGET_ARCH)" >>> + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)" >>> endif >>> >>> if USE_ALT_JAR >>> @@ -285,7 +285,7 @@ if ENABLE_CROSS_COMPILATION >>> if ENABLE_CROSS_COMPILATION >>> ICEDTEA_ENV_ECJ += \ >>> CROSS_COMPILATION="true" \ >>> - TARGET_ARCH="$(TARGET_ARCH)" >>> + CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)" >>> endif >>> >>> env-ecj: >>> diff -r fd613af504b2 -r 4501bcea5ffd acinclude.m4 >>> --- a/acinclude.m4 Fri May 22 10:13:16 2009 -0400 >>> +++ b/acinclude.m4 Mon May 25 12:40:45 2009 +0200 >>> @@ -5,77 +5,77 @@ AC_DEFUN([SET_ARCH_DIRS], >>> BUILD_ARCH_DIR=amd64 >>> INSTALL_ARCH_DIR=amd64 >>> JRE_ARCH_DIR=amd64 >>> - TARGET_ARCH=x86_64 >>> + CROSS_TARGET_ARCH=x86_64 >>> ;; >>> i?86-*-*) >>> BUILD_ARCH_DIR=i586 >>> INSTALL_ARCH_DIR=i386 >>> JRE_ARCH_DIR=i386 >>> ARCH_PREFIX=${LINUX32} >>> - TARGET_ARCH=i386 >>> + CROSS_TARGET_ARCH=i386 >>> ;; >>> alpha*-*-*) >>> BUILD_ARCH_DIR=alpha >>> INSTALL_ARCH_DIR=alpha >>> JRE_ARCH_DIR=alpha >>> - TARGET_ARCH=alpha >>> + CROSS_TARGET_ARCH=alpha >>> ;; >>> arm*-*-*) >>> BUILD_ARCH_DIR=arm >>> INSTALL_ARCH_DIR=arm >>> JRE_ARCH_DIR=arm >>> - TARGET_ARCH=arm >>> + CROSS_TARGET_ARCH=arm >>> ;; >>> mips-*-*) >>> BUILD_ARCH_DIR=mips >>> INSTALL_ARCH_DIR=mips >>> JRE_ARCH_DIR=mips >>> - TARGET_ARCH=mips >>> + CROSS_TARGET_ARCH=mips >>> ;; >>> mipsel-*-*) >>> BUILD_ARCH_DIR=mipsel >>> INSTALL_ARCH_DIR=mipsel >>> JRE_ARCH_DIR=mipsel >>> - TARGET_ARCH=mipsel >>> + CROSS_TARGET_ARCH=mipsel >>> ;; >>> powerpc-*-*) >>> BUILD_ARCH_DIR=ppc >>> INSTALL_ARCH_DIR=ppc >>> JRE_ARCH_DIR=ppc >>> ARCH_PREFIX=${LINUX32} >>> - TARGET_ARCH=ppc >>> + CROSS_TARGET_ARCH=ppc >>> ;; >>> powerpc64-*-*) >>> BUILD_ARCH_DIR=ppc64 >>> INSTALL_ARCH_DIR=ppc64 >>> JRE_ARCH_DIR=ppc64 >>> - TARGET_ARCH=ppc64 >>> + CROSS_TARGET_ARCH=ppc64 >>> ;; >>> sparc64-*-*) >>> BUILD_ARCH_DIR=sparcv9 >>> INSTALL_ARCH_DIR=sparcv9 >>> JRE_ARCH_DIR=sparc64 >>> - TARGET_ARCH=sparc64 >>> + CROSS_TARGET_ARCH=sparc64 >>> ;; >>> s390-*-*) >>> BUILD_ARCH_DIR=s390 >>> INSTALL_ARCH_DIR=s390 >>> JRE_ARCH_DIR=s390 >>> ARCH_PREFIX=${LINUX32} >>> - TARGET_ARCH=s390 >>> + CROSS_TARGET_ARCH=s390 >>> ;; >>> *) >>> BUILD_ARCH_DIR=`uname -m` >>> INSTALL_ARCH_DIR=$BUILD_ARCH_DIR >>> JRE_ARCH_DIR=$INSTALL_ARCH_DIR >>> - TARGET_ARCH=$BUILD_ARCH_DIR >>> + CROSS_TARGET_ARCH=$BUILD_ARCH_DIR >>> ;; >>> esac >>> AC_SUBST(BUILD_ARCH_DIR) >>> AC_SUBST(INSTALL_ARCH_DIR) >>> AC_SUBST(JRE_ARCH_DIR) >>> AC_SUBST(ARCH_PREFIX) >>> - AC_SUBST(TARGET_ARCH) >>> + AC_SUBST(CROSS_TARGET_ARCH) >>> ]) >>> >>> AC_DEFUN([SET_OS_DIRS], >>> diff -r fd613af504b2 -r 4501bcea5ffd >>> patches/icedtea-explicit-target-arch.patch >>> --- a/patches/icedtea-explicit-target-arch.patch Fri May 22 >>> 10:13:16 2009 -0400 >>> +++ b/patches/icedtea-explicit-target-arch.patch Mon May 25 >>> 12:40:45 2009 +0200 >>> @@ -16,7 +16,7 @@ Index: openjdk/hotspot/make/linux/makefi >>> +ifndef CROSS_COMPILATION >>> + ARCH:=$(shell uname -m) >>> +else >>> -+ ARCH:=$(TARGET_ARCH) >>> ++ ARCH:=$(CROSS_TARGET_ARCH) >>> +endif >>> PATH_SEP = : >>> ifeq ($(LP64), 1) >>> @@ -38,7 +38,7 @@ Index: openjdk/jdk/make/common/shared/Pl >>> + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU >>> 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') >>> + endif >>> + else >>> -+ mach := $(TARGET_ARCH) >>> ++ mach := $(CROSS_TARGET_ARCH) >>> endif >>> archExpr = case "$(mach)" in \ >>> i[3-9]86) \ >>> @@ -62,7 +62,7 @@ Index: openjdk/corba/make/common/shared/ >>> + endif >>> + else >>> + # Cross-compilation: Assume target archicture is given. >>> -+ mach := $(TARGET_ARCH) >>> ++ mach := $(CROSS_TARGET_ARCH) >>> endif >>> archExpr = case "$(mach)" in \ >>> i[3-9]86) \ >>> >> > From xerxes at zafena.se Mon May 25 06:47:27 2009 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 25 May 2009 15:47:27 +0200 Subject: changeset in /hg/icedtea6: 2009-05-25 Xerxes R?nby References: <4A1A780D.8040200@zafena.se> <4A1A88FB.2060405@redhat.com> <4A1A8E4B.60702@redhat.com> Message-ID: <4A1AA16F.10007@zafena.se> Lillian Angel skrev: > Lillian Angel wrote: >> Xerxes R?nby wrote: >>> >>> Hi, >>> >>> Ok to apply this to the icedtea6-1.5 branch? >> >> We are just at the end of our testing, as I am sure a lot of people >> are. Mind if we leave this out? Unless it is crucial to get in. > > I just read the thread you forwarded to me. Please go ahead and apply > it to the release branch, since this option is not set by default. > > > Cheers > >> >> >> Thanks, >> Lillian >> Applied http://icedtea.classpath.org/hg/release/icedtea6-1.5/rev/ffe92bbe7e84 Thanks, Xerxes From omajid at redhat.com Mon May 25 07:20:46 2009 From: omajid at redhat.com (Omair Majid) Date: Mon, 25 May 2009 10:20:46 -0400 Subject: RFC: Better Netx error message Message-ID: <4A1AA93E.7060504@redhat.com> Hi, Netx's error messages tend to be cryptic. For example, running javaws on a jnlp with missing 'title' and 'home' elements: $ javaws Broken.jnlp netx: null That doesnt make it clear if javaws did anything. Perhaps it ran to completion? The attached patch makes the error a lot more explicit: $ java net.sourceforge.jnlp.runtime.Boot Broken.jnlp netx: Unexpected java.lang.NullPointerException at java.lang.Thread.init(Thread.java:366) ChangeLog: 2009-05-25 Omair Majid * rt/net/sourceforge/jnlp/resources/Messages.properties: Add RUnexpected to show generic information * rt/net/sourceforge/jnlp/runtime/Boot.java (run): Show more information about the fatal exception. Any comments? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: netx-better-error-messages.patch Type: text/x-patch Size: 1190 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090525/1ec1ae38/netx-better-error-messages.patch From dbhole at redhat.com Mon May 25 10:19:01 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 25 May 2009 13:19:01 -0400 Subject: RFC: Better Netx error message In-Reply-To: <4A1AA93E.7060504@redhat.com> References: <4A1AA93E.7060504@redhat.com> Message-ID: <20090525171901.GB26456@redhat.com> * Omair Majid [2009-05-25 10:21]: > Hi, > > Netx's error messages tend to be cryptic. For example, running javaws on > a jnlp with missing 'title' and 'home' elements: > $ javaws Broken.jnlp > netx: null > That doesnt make it clear if javaws did anything. Perhaps it ran to > completion? The attached patch makes the error a lot more explicit: > $ java net.sourceforge.jnlp.runtime.Boot Broken.jnlp > netx: Unexpected java.lang.NullPointerException at > java.lang.Thread.init(Thread.java:366) > > ChangeLog: > 2009-05-25 Omair Majid > * rt/net/sourceforge/jnlp/resources/Messages.properties: Add > RUnexpected to show generic information > * rt/net/sourceforge/jnlp/runtime/Boot.java (run): Show more > information about the fatal exception. > > > Any comments? > Looks good. Please go ahead and apply. Deepak From omajid at redhat.com Mon May 25 10:54:14 2009 From: omajid at redhat.com (Omair Majid) Date: Mon, 25 May 2009 17:54:14 +0000 Subject: changeset in /hg/icedtea6: 2009-05-25 Omair Majid changeset 9293bf2e49a9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9293bf2e49a9 description: 2009-05-25 Omair Majid * rt/net/sourceforge/jnlp/resources/Messages.properties: Add RUnexpected to show generic unexpected information. * rt/net/sourceforge/jnlp/runtime/Boot.java (run): Show more information about the fatal exception. diffstat: 3 files changed, 10 insertions(+), 1 deletion(-) ChangeLog | 7 +++++++ rt/net/sourceforge/jnlp/resources/Messages.properties | 1 + rt/net/sourceforge/jnlp/runtime/Boot.java | 3 ++- diffs (38 lines): diff -r 4501bcea5ffd -r 9293bf2e49a9 ChangeLog --- a/ChangeLog Mon May 25 12:40:45 2009 +0200 +++ b/ChangeLog Mon May 25 13:54:44 2009 -0400 @@ -1,3 +1,10 @@ 2009-05-25 Xerxes R??nby + + * rt/net/sourceforge/jnlp/resources/Messages.properties: Add + RUnexpected to show generic unexpected information. + * rt/net/sourceforge/jnlp/runtime/Boot.java (run): Show more + information about the fatal exception. + 2009-05-25 Xerxes R??nby * acinclude.m4: Fix: Renamed TARGET_ARCH to CROSS_TARGET_ARCH diff -r 4501bcea5ffd -r 9293bf2e49a9 rt/net/sourceforge/jnlp/resources/Messages.properties --- a/rt/net/sourceforge/jnlp/resources/Messages.properties Mon May 25 12:40:45 2009 +0200 +++ b/rt/net/sourceforge/jnlp/resources/Messages.properties Mon May 25 13:54:44 2009 -0400 @@ -105,6 +105,7 @@ RCantReplaceSM=Changing the SecurityMana RCantReplaceSM=Changing the SecurityManager is not allowed. RDenyStopped=Stopped applications have no permissions. RExitNoApp=Can not exit the JVM because the current application cannot be determined. +RUnexpected=Unexpected {0} at {1} # Boot options, message should be shorter than this ----------------> BOUsage=javaws [-run-options] diff -r 4501bcea5ffd -r 9293bf2e49a9 rt/net/sourceforge/jnlp/runtime/Boot.java --- a/rt/net/sourceforge/jnlp/runtime/Boot.java Mon May 25 12:40:45 2009 +0200 +++ b/rt/net/sourceforge/jnlp/runtime/Boot.java Mon May 25 13:54:44 2009 -0400 @@ -209,7 +209,8 @@ public final class Boot implements Privi if (JNLPRuntime.isDebug()) ex.printStackTrace(); - fatalError(ex.getMessage()); + fatalError(JNLPRuntime.getMessage("RUnexpected", + new Object[] {ex.toString(), ex.getStackTrace()[0]} )); } return null; From gnu_andrew at member.fsf.org Tue May 26 01:33:46 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 26 May 2009 09:33:46 +0100 Subject: IcedTea6-1.5 release branch created In-Reply-To: <4A1A8A3C.7000701@redhat.com> References: <4A12A1A9.8050903@redhat.com> <20090524120111.0ee0eeda@workstation64.home> <4A1A8A3C.7000701@redhat.com> Message-ID: <17c6771e0905260133t6a6153f8xdbcd4bc3aae17a5b@mail.gmail.com> 2009/5/25 Lillian Angel : > Andreas Radke wrote: >> >> Am Tue, 19 May 2009 08:10:17 -0400 >> schrieb Lillian Angel : >> >> >>> >>> Hi, >>> >>> I have tagged the main repo with the tag "icedtea6-1.5rc3" and >>> created the release branch here: >>> http://icedtea.classpath.org/hg/release/icedtea6-1.5 >>> >>> Any patches that are required to go into the release branch should be >>> discussed on list. If they are approved to go in, they must be >>> applied to both the main branch and the release branch. >>> >>> >>> Cheers, >>> Lillian >>> >>> >> >> I've used the hg 1.5rc3 tarball and get this build error: >> >> ../../../src/solaris/classes/sun/awt/X11/ListHelper.java >> # Running javac: >> /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/bootstrap/jdk1.6.0/bin/java >> -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m >> -Xbootclasspath/p:/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar >> -jar >> /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar >> -g -source 1.5 -target 5 -encoding ascii >> -Xbootclasspath:/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/classes >> -sourcepath >> /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/gensrc:../../../src/solaris/classes:../../../src/share/classes >> -d >> /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/classes >> @/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/tmp/sun/sun.awt.X11/xawt/.classes.list >> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:415: cannot find >> symbol >> symbol ?: variable XAWTIcon32_java_icon16_png >> location: class sun.awt.X11.XWindowPeer >> ? ? ? ? ? ? ? ?defaultIconInfo.add(new >> XIconInfo(XAWTIcon32_java_icon16_png.java_icon16_png)); >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:416: cannot find >> symbol >> symbol ?: variable XAWTIcon32_java_icon24_png >> location: class sun.awt.X11.XWindowPeer >> ? ? ? ? ? ? ? ?defaultIconInfo.add(new >> XIconInfo(XAWTIcon32_java_icon24_png.java_icon24_png)); >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:417: cannot find >> symbol >> symbol ?: variable XAWTIcon32_java_icon32_png >> location: class sun.awt.X11.XWindowPeer >> ? ? ? ? ? ? ? ?defaultIconInfo.add(new >> XIconInfo(XAWTIcon32_java_icon32_png.java_icon32_png)); >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:418: cannot find >> symbol >> symbol ?: variable XAWTIcon32_java_icon48_png >> location: class sun.awt.X11.XWindowPeer >> ? ? ? ? ? ? ? ?defaultIconInfo.add(new >> XIconInfo(XAWTIcon32_java_icon48_png.java_icon48_png)); >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:420: cannot find >> symbol >> symbol ?: variable XAWTIcon64_java_icon16_png >> location: class sun.awt.X11.XWindowPeer >> ? ? ? ? ? ? ? ?defaultIconInfo.add(new >> XIconInfo(XAWTIcon64_java_icon16_png.java_icon16_png)); >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:421: cannot find >> symbol >> symbol ?: variable XAWTIcon64_java_icon24_png >> location: class sun.awt.X11.XWindowPeer >> ? ? ? ? ? ? ? ?defaultIconInfo.add(new >> XIconInfo(XAWTIcon64_java_icon24_png.java_icon24_png)); >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:422: cannot find >> symbol >> symbol ?: variable XAWTIcon64_java_icon32_png >> location: class sun.awt.X11.XWindowPeer >> ? ? ? ? ? ? ? ?defaultIconInfo.add(new >> XIconInfo(XAWTIcon64_java_icon32_png.java_icon32_png)); >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:423: cannot find >> symbol >> symbol ?: variable XAWTIcon64_java_icon48_png >> location: class sun.awt.X11.XWindowPeer >> ? ? ? ? ? ? ? ?defaultIconInfo.add(new >> XIconInfo(XAWTIcon64_java_icon48_png.java_icon48_png)); >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >> Note: Some input files use or override a deprecated API. >> Note: Recompile with -Xlint:deprecation for details. >> Note: Some input files use unchecked or unsafe operations. >> Note: Recompile with -Xlint:unchecked for details. >> 8 errors >> make[4]: *** [.compile.classlist] Error 1 >> make[4]: Leaving directory >> `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make/sun/xawt' >> make[3]: *** [all] Error 1 >> make[3]: Leaving directory >> `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make/sun' >> make[2]: *** [all] Error 1 >> make[2]: Leaving directory >> `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make' >> make[1]: *** [jdk-build] Fehler 2 >> make[1]: Leaving directory >> `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk' >> make: *** [stamps/icedtea.stamp] Fehler 2 >> ==> FEHLER: Build fehlgeschlagen. >> >> >> Any idea? > > > What configure options are you using? I cannot reproduce it with mine. > > > Cheers, > Lillian > These XAWT* files are auto-generated rather than being part of the OpenJDK download. You're likely to see this error with a full bootstrap, but AFAIK plenty of people have done a full bootstrap since the move to b16 without such issue. -- 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 Tue May 26 01:35:58 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 26 May 2009 09:35:58 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <1243205284.30320.15.camel@hermans.wildebeest.org> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905190253u8981eddr10fc5aeb9dbe6174@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> <1243063124.3579.19.camel@hermans.wildebeest.org> <1243205284.30320.15.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905260135t59013f4dwc7ad25dea9520d28@mail.gmail.com> 2009/5/24 Mark Wielaard : > On Sat, 2009-05-23 at 09:18 +0200, Mark Wielaard wrote: >> On Fri, 2009-05-22 at 20:05 +0200, Mark Wielaard wrote: >> > On Fri, 2009-05-22 at 18:35 +0100, Andrew John Hughes wrote: >> > > Are there any negative side-effects to having this code applied all the time? >> > >> > No, the patches are designed so that without the property set the old >> > pipeline is used. >> >> That said, if you do build with --disable-xrender then the font issue >> doesn't occur. So something else is broken with the xrender support :( >> I propose that we disable xrender support by default for now while we >> figure out what else is borked. > > Found it. The X11 pipeline initialization is a bit tricky to follow. The > xrender patches tried to clear that up at one point by making the > initialization of the X11SurfaceData explicit (just like the > XRSurfaceData). Although that code is nicer and cleaner, the new font > code depends on the implicit static initializer calling order. That is a > bit yucky, but lets play along and make sure that no explicit > initialization is done: > > 2009-05-24 ?Mark Wielaard ? > > ? ? ? ?* patches/xrender/icedtea-001.patch: Initialize X11SurfaceData > ? ? ? ?implicitly, not explicitly. > > Now both the standard X11 pipeline (default) and the XRender pipeline > (-Dsun.java2d.xrender=True) work again against IcedTea7. > > Cheers, > > Mark > Thanks for finding and fixing this. I narrowed it down to X11SurfaceData on Friday (a diff between the non-xrender and xrender versions showed this was the only place with a change that would make any effect), but it was too late to find a fix. -- 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 Tue May 26 01:37:19 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 26 May 2009 09:37:19 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905260135t59013f4dwc7ad25dea9520d28@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> <1243063124.3579.19.camel@hermans.wildebeest.org> <1243205284.30320.15.camel@hermans.wildebeest.org> <17c6771e0905260135t59013f4dwc7ad25dea9520d28@mail.gmail.com> Message-ID: <17c6771e0905260137m15adc51j8c59f4c9494374d1@mail.gmail.com> 2009/5/26 Andrew John Hughes : > 2009/5/24 Mark Wielaard : >> On Sat, 2009-05-23 at 09:18 +0200, Mark Wielaard wrote: >>> On Fri, 2009-05-22 at 20:05 +0200, Mark Wielaard wrote: >>> > On Fri, 2009-05-22 at 18:35 +0100, Andrew John Hughes wrote: >>> > > Are there any negative side-effects to having this code applied all the time? >>> > >>> > No, the patches are designed so that without the property set the old >>> > pipeline is used. >>> >>> That said, if you do build with --disable-xrender then the font issue >>> doesn't occur. So something else is broken with the xrender support :( >>> I propose that we disable xrender support by default for now while we >>> figure out what else is borked. >> >> Found it. The X11 pipeline initialization is a bit tricky to follow. The >> xrender patches tried to clear that up at one point by making the >> initialization of the X11SurfaceData explicit (just like the >> XRSurfaceData). Although that code is nicer and cleaner, the new font >> code depends on the implicit static initializer calling order. That is a >> bit yucky, but lets play along and make sure that no explicit >> initialization is done: >> >> 2009-05-24 ?Mark Wielaard ? >> >> ? ? ? ?* patches/xrender/icedtea-001.patch: Initialize X11SurfaceData >> ? ? ? ?implicitly, not explicitly. >> >> Now both the standard X11 pipeline (default) and the XRender pipeline >> (-Dsun.java2d.xrender=True) work again against IcedTea7. >> >> Cheers, >> >> Mark >> > > Thanks for finding and fixing this. ?I narrowed it down to > X11SurfaceData on Friday (a diff between the non-xrender and xrender > versions showed this was the only place with a change that would make > any effect), but it was too late to find a fix. > -- > 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 > BTW, this demonstrates an issue with importing additional code where the upstream isn't tracking JDK7 updates... -- 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 Tue May 26 02:01:31 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 26 May 2009 10:01:31 +0100 Subject: Transplant icedtea-freetypeversion.patch to icedtea7 In-Reply-To: <1243168446.3729.49.camel@hermans.wildebeest.org> References: <1243168446.3729.49.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905260201o298ededcwe1e2636530a8f549@mail.gmail.com> 2009/5/24 Mark Wielaard : > Hi, > > I transplanted this change from icedtea6 to icedtea7 because it is > needed to build on older systems: > > 2009-05-04 ?Mark Wielaard ? > > ? ?* Makefile.am (ICEDTEA_PATCHES): Add icedtea-freetypeversion.patch. > ? ?* patches/icedtea-freetypeversion.patch: New patch. > ? ?* HACKING: Document new patch. > > Cheers, > > Mark > > I didn't port across this change because it was in the process of going upstream and hasn't yet been approved. Is there any news on this? I'd prefer new patches were added via OpenJDK unless there is some desperate need for them to be in IcedTea7 now. -- 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 mark at klomp.org Tue May 26 02:16:20 2009 From: mark at klomp.org (Mark Wielaard) Date: Tue, 26 May 2009 11:16:20 +0200 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905260137m15adc51j8c59f4c9494374d1@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905201334p795641bn8e677c7f66014aec@mail.gmail.com> <1243004611.3655.105.camel@hermans.wildebeest.org> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> <1243063124.3579.19.camel@hermans.wildebeest.org> <1243205284.30320.15.camel@hermans.wildebeest.org> <17c6771e0905260135t59013f4dwc7ad25dea9520d28@mail.gmail.com> <17c6771e0905260137m15adc51j8c59f4c9494374d1@mail.gmail.com> Message-ID: <1243329380.20462.14.camel@hermans.wildebeest.org> On Tue, 2009-05-26 at 09:37 +0100, Andrew John Hughes wrote: > > Thanks for finding and fixing this. I narrowed it down to > > X11SurfaceData on Friday (a diff between the non-xrender and xrender > > versions showed this was the only place with a change that would make > > any effect), but it was too late to find a fix. > > BTW, this demonstrates an issue with importing additional code where > the upstream isn't tracking JDK7 updates... That is precisely what these patches do, make sure the code tracks jdk7 so it can be included in IcedTea7. Cheers, Mark From mark at klomp.org Tue May 26 02:14:38 2009 From: mark at klomp.org (Mark Wielaard) Date: Tue, 26 May 2009 11:14:38 +0200 Subject: Transplant icedtea-freetypeversion.patch to icedtea7 In-Reply-To: <17c6771e0905260201o298ededcwe1e2636530a8f549@mail.gmail.com> References: <1243168446.3729.49.camel@hermans.wildebeest.org> <17c6771e0905260201o298ededcwe1e2636530a8f549@mail.gmail.com> Message-ID: <1243329278.20462.13.camel@hermans.wildebeest.org> On Tue, 2009-05-26 at 10:01 +0100, Andrew John Hughes wrote: > I didn't port across this change because it was in the process of > going upstream and hasn't yet been approved. Is there any news on > this? The discussion seems stalled. > I'd prefer new patches were added via OpenJDK unless there is some > desperate need for them to be in IcedTea7 now. It is needed to build IcedTea on older platforms and is already in IcedTea6. Cheers, Mark From gnu_andrew at member.fsf.org Tue May 26 03:08:32 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 26 May 2009 11:08:32 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <1243329380.20462.14.camel@hermans.wildebeest.org> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905220828q73969929rd35eb388b8a1b9b5@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> <1243063124.3579.19.camel@hermans.wildebeest.org> <1243205284.30320.15.camel@hermans.wildebeest.org> <17c6771e0905260135t59013f4dwc7ad25dea9520d28@mail.gmail.com> <17c6771e0905260137m15adc51j8c59f4c9494374d1@mail.gmail.com> <1243329380.20462.14.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905260308s14a81f8es18592db5294a6cda@mail.gmail.com> 2009/5/26 Mark Wielaard : > On Tue, 2009-05-26 at 09:37 +0100, Andrew John Hughes wrote: >> > Thanks for finding and fixing this. ?I narrowed it down to >> > X11SurfaceData on Friday (a diff between the non-xrender and xrender >> > versions showed this was the only place with a change that would make >> > any effect), but it was too late to find a fix. >> >> BTW, this demonstrates an issue with importing additional code where >> the upstream isn't tracking JDK7 updates... > > That is precisely what these patches do, make sure the code tracks jdk7 > so it can be included in IcedTea7. > Yes, but my point was we wouldn't have run into this issues if upstream was keeping pace with jdk7 development. We have to be careful which projects we import if we're going to end up maintaining them over successive jdk7 releases, which happen on a weekly basis. Clemens, can you look into incorporating Mark's changes upstream? > Cheers, > > Mark > > 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 doko at ubuntu.com Tue May 26 03:12:31 2009 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 26 May 2009 12:12:31 +0200 Subject: OpenJDK7 b59 still contains licenses which hinder inclusion in linux distributions Message-ID: <4A1BC08F.5020700@ubuntu.com> While updating packages for OpenJDK7, I see that there are unfortunately still some license issues pending. These files are removed when running the fsg.sh script, but still included in the jdk tarball downloaded during the icedtea build. However I don't see any bug reports filed for these as a dependency of IcedTea report #138. Did we address license issues with binary files which don't carry license/copyright notives itself, like jdk/test/sun/net/idn/*.spp ? Matthias rm -f \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ openjdk/jdk/test/java/util/Locale/LocaleTest.java \ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java # Remove J2DBench sources, some of which have questionable license # headers. rm -rf \ openjdk/jdk/src/share/demo/java2d/J2DBench From gnu_andrew at member.fsf.org Tue May 26 03:25:26 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 26 May 2009 11:25:26 +0100 Subject: OpenJDK7 b59 still contains licenses which hinder inclusion in linux distributions In-Reply-To: <4A1BC08F.5020700@ubuntu.com> References: <4A1BC08F.5020700@ubuntu.com> Message-ID: <17c6771e0905260325q550876eem25513cb3ca4c7bac@mail.gmail.com> 2009/5/26 Matthias Klose : > While updating packages for OpenJDK7, I see that there are unfortunately still > some license issues pending. These files are removed when running the fsg.sh > script, but still included in the jdk tarball downloaded during the icedtea > build. However I don't see any bug reports filed for these as a dependency of > IcedTea report #138. > > Did we address license issues with binary files which don't carry > license/copyright notives itself, like jdk/test/sun/net/idn/*.spp ? > > ?Matthias > > > rm -f \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ > ? openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ > ? openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ > ? openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ > ? openjdk/jdk/test/java/util/Locale/LocaleTest.java \ > ? openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ > ? openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ > ? openjdk/jdk/test/sun/text/resources/LocaleDataTest.java > > # Remove J2DBench sources, some of which have questionable license > # headers. > rm -rf \ > ?openjdk/jdk/src/share/demo/java2d/J2DBench > Please file a bug or bugs for these. I don't recall seeing this discussed at all, but the script has been in IcedTea{6,7} for about a year. -- 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 langel at redhat.com Tue May 26 05:01:50 2009 From: langel at redhat.com (Lillian Angel) Date: Tue, 26 May 2009 08:01:50 -0400 Subject: IcedTea6-1.5 release branch created In-Reply-To: <17c6771e0905260133t6a6153f8xdbcd4bc3aae17a5b@mail.gmail.com> References: <4A12A1A9.8050903@redhat.com> <20090524120111.0ee0eeda@workstation64.home> <4A1A8A3C.7000701@redhat.com> <17c6771e0905260133t6a6153f8xdbcd4bc3aae17a5b@mail.gmail.com> Message-ID: <4A1BDA2E.3070802@redhat.com> Andrew John Hughes wrote: > 2009/5/25 Lillian Angel : > >> Andreas Radke wrote: >> >>> Am Tue, 19 May 2009 08:10:17 -0400 >>> schrieb Lillian Angel : >>> >>> >>> >>>> Hi, >>>> >>>> I have tagged the main repo with the tag "icedtea6-1.5rc3" and >>>> created the release branch here: >>>> http://icedtea.classpath.org/hg/release/icedtea6-1.5 >>>> >>>> Any patches that are required to go into the release branch should be >>>> discussed on list. If they are approved to go in, they must be >>>> applied to both the main branch and the release branch. >>>> >>>> >>>> Cheers, >>>> Lillian >>>> >>>> >>>> >>> I've used the hg 1.5rc3 tarball and get this build error: >>> >>> ../../../src/solaris/classes/sun/awt/X11/ListHelper.java >>> # Running javac: >>> /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/bootstrap/jdk1.6.0/bin/java >>> -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m >>> -Xbootclasspath/p:/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar >>> -jar >>> /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar >>> -g -source 1.5 -target 5 -encoding ascii >>> -Xbootclasspath:/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/classes >>> -sourcepath >>> /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/gensrc:../../../src/solaris/classes:../../../src/share/classes >>> -d >>> /tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/classes >>> @/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/build/linux-amd64/tmp/sun/sun.awt.X11/xawt/.classes.list >>> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:415: cannot find >>> symbol >>> symbol : variable XAWTIcon32_java_icon16_png >>> location: class sun.awt.X11.XWindowPeer >>> defaultIconInfo.add(new >>> XIconInfo(XAWTIcon32_java_icon16_png.java_icon16_png)); >>> ^ >>> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:416: cannot find >>> symbol >>> symbol : variable XAWTIcon32_java_icon24_png >>> location: class sun.awt.X11.XWindowPeer >>> defaultIconInfo.add(new >>> XIconInfo(XAWTIcon32_java_icon24_png.java_icon24_png)); >>> ^ >>> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:417: cannot find >>> symbol >>> symbol : variable XAWTIcon32_java_icon32_png >>> location: class sun.awt.X11.XWindowPeer >>> defaultIconInfo.add(new >>> XIconInfo(XAWTIcon32_java_icon32_png.java_icon32_png)); >>> ^ >>> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:418: cannot find >>> symbol >>> symbol : variable XAWTIcon32_java_icon48_png >>> location: class sun.awt.X11.XWindowPeer >>> defaultIconInfo.add(new >>> XIconInfo(XAWTIcon32_java_icon48_png.java_icon48_png)); >>> ^ >>> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:420: cannot find >>> symbol >>> symbol : variable XAWTIcon64_java_icon16_png >>> location: class sun.awt.X11.XWindowPeer >>> defaultIconInfo.add(new >>> XIconInfo(XAWTIcon64_java_icon16_png.java_icon16_png)); >>> ^ >>> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:421: cannot find >>> symbol >>> symbol : variable XAWTIcon64_java_icon24_png >>> location: class sun.awt.X11.XWindowPeer >>> defaultIconInfo.add(new >>> XIconInfo(XAWTIcon64_java_icon24_png.java_icon24_png)); >>> ^ >>> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:422: cannot find >>> symbol >>> symbol : variable XAWTIcon64_java_icon32_png >>> location: class sun.awt.X11.XWindowPeer >>> defaultIconInfo.add(new >>> XIconInfo(XAWTIcon64_java_icon32_png.java_icon32_png)); >>> ^ >>> ../../../src/solaris/classes/sun/awt/X11/XWindowPeer.java:423: cannot find >>> symbol >>> symbol : variable XAWTIcon64_java_icon48_png >>> location: class sun.awt.X11.XWindowPeer >>> defaultIconInfo.add(new >>> XIconInfo(XAWTIcon64_java_icon48_png.java_icon48_png)); >>> ^ >>> Note: Some input files use or override a deprecated API. >>> Note: Recompile with -Xlint:deprecation for details. >>> Note: Some input files use unchecked or unsafe operations. >>> Note: Recompile with -Xlint:unchecked for details. >>> 8 errors >>> make[4]: *** [.compile.classlist] Error 1 >>> make[4]: Leaving directory >>> `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make/sun/xawt' >>> make[3]: *** [all] Error 1 >>> make[3]: Leaving directory >>> `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make/sun' >>> make[2]: *** [all] Error 1 >>> make[2]: Leaving directory >>> `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk/jdk/make' >>> make[1]: *** [jdk-build] Fehler 2 >>> make[1]: Leaving directory >>> `/tmp/openjdk6/trunk/src/icedtea6-926c38e2b283/openjdk' >>> make: *** [stamps/icedtea.stamp] Fehler 2 >>> ==> FEHLER: Build fehlgeschlagen. >>> >>> >>> Any idea? >>> >> What configure options are you using? I cannot reproduce it with mine. >> >> >> Cheers, >> Lillian >> >> > > These XAWT* files are auto-generated rather than being part of the > OpenJDK download. You're likely to see this error with a full > bootstrap, but AFAIK plenty of people have done a full bootstrap since > the move to b16 without such issue. > I can't seem to reproduce it with a full bootstrap either. Cheers, Lillian From gnu_andrew at member.fsf.org Tue May 26 09:35:56 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 26 May 2009 17:35:56 +0100 Subject: IcedTea7 - fwd: JDK 7 M3 build 59 is the JavaOne Preview Release Message-ID: <17c6771e0905260935r8e159e7g2e430cb6276dae21@mail.gmail.com> ---------- Forwarded message ---------- From: Mark Reinhold Date: 2009/5/26 Subject: JDK 7 M3 build 59 is the JavaOne Preview Release To: jdk7-dev at openjdk.java.net We're done! ?The QA team has not identified any showstoppers in build 59, so that will be the J1 Preview Release. Build 60 will be the first build of Milestone 4. - Mark See the above message from Mark Reinhold; b59 (on which IcedTea7 is currently based) is the J1 preview. I'd like to do a little more testing (make distcheck mainly) and then release. Anyone know of any showstoppers? The release will probably be tomorrow morning (UTC), given it's already 5:30pm here. -- 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 omajid at redhat.com Tue May 26 10:53:02 2009 From: omajid at redhat.com (Omair Majid) Date: Tue, 26 May 2009 13:53:02 -0400 Subject: RFC: Netx - Check and store intial-heap-size and max-heap-size Message-ID: <4A1C2C7E.5090006@redhat.com> Hi, JNLP files can specify the initial heap size and the max heap size for the JVM. NetX currently ignores these. The attached patch makes Netx check that the values supplied in the JNLP file are correct, and store them as strings to preserve the original values. ChangeLog: 2009-05-26 Omair Majid * rt/net/sourceforge/jnlp/JREDesc.java: Change type of initialHeapSize to String. Change type of maximumHeapSize to String. (JREDesc): Check for sensible values for heap sizes. (getMaximumHeapSize): Change return type to String. (getInitialHeapSize): Likewise. (heapToLong): Renamed to checkHeapSize. (checkHeapSize): Check for valid heap size. * rt/net/sourceforge/jnlp/resources/Messages.properties: Add PBadHeapSize message to indicate an invalid heap size. Any comments? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: netx-vm-heap-sizes.patch Type: text/x-patch Size: 3921 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090526/06cc3a5f/netx-vm-heap-sizes.patch From doko at ubuntu.com Tue May 26 14:59:32 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Tue, 26 May 2009 21:59:32 +0000 Subject: changeset in /hg/icedtea: 2009-05-26 Matthias Klose changeset ecb875f82ef5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ecb875f82ef5 description: 2009-05-26 Matthias Klose * patches/cacao/launcher.patch: Update for OpenJDK 7. diffstat: 2 files changed, 10 insertions(+), 8 deletions(-) ChangeLog | 4 ++++ patches/cacao/launcher.patch | 14 ++++++-------- diffs (56 lines): diff -r 51313371451a -r ecb875f82ef5 ChangeLog --- a/ChangeLog Mon May 25 00:26:26 2009 +0200 +++ b/ChangeLog Tue May 26 23:54:58 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-24 Mark Wielaard + + * patches/cacao/launcher.patch: Update for OpenJDK 7. + 2009-05-24 Mark Wielaard * patches/xrender/icedtea-001.patch: Initialize X11SurfaceData diff -r 51313371451a -r ecb875f82ef5 patches/cacao/launcher.patch --- a/patches/cacao/launcher.patch Mon May 25 00:26:26 2009 +0200 +++ b/patches/cacao/launcher.patch Tue May 26 23:54:58 2009 +0200 @@ -10,9 +10,8 @@ diff -Nru openjdk.orig/jdk/make/docs/Mak endif # -diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c ---- openjdk.orig/jdk/src/share/bin/java.c 2009-05-19 01:11:05.000000000 +0100 -+++ openjdk/jdk/src/share/bin/java.c 2009-05-20 20:22:14.000000000 +0100 +--- openjdk/jdk/src/share/bin/java.c.orig 2009-05-26 21:16:09.000000000 +0000 ++++ openjdk/jdk/src/share/bin/java.c 2009-05-26 21:29:41.000000000 +0000 @@ -175,6 +175,8 @@ InvocationFunctions ifn; } JavaMainArgs; @@ -22,7 +21,7 @@ diff -Nru openjdk.orig/jdk/src/share/bin /* * Entry point. */ -@@ -1871,6 +1873,8 @@ +@@ -1875,6 +1877,8 @@ { /* Create a new thread to create JVM and invoke main method */ JavaMainArgs args; @@ -31,7 +30,7 @@ diff -Nru openjdk.orig/jdk/src/share/bin int rslt; args.argc = argc; -@@ -1879,7 +1883,18 @@ +@@ -1883,7 +1887,17 @@ args.classname = classname; args.ifn = *ifn; @@ -39,9 +38,8 @@ diff -Nru openjdk.orig/jdk/src/share/bin + memset((void*)&cacao_args, 0, sizeof(cacao_args)); + cacao_args.version = JNI_VERSION_CACAO; + -+ jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args); -+ if (_launcher_debug) -+ printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no"); ++ jvm_init_rv = ifn->GetDefaultJavaVMInitArgs(&cacao_args); ++ JLI_TraceLauncher("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no"); + + if (jvm_init_rv == 0) + return JavaMain((void*)&args); From gnu_andrew at member.fsf.org Tue May 26 15:25:11 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 26 May 2009 23:25:11 +0100 Subject: changeset in /hg/icedtea: 2009-05-26 Matthias Klose References: Message-ID: <17c6771e0905261525i52743190iee72d517d92d79e6@mail.gmail.com> 2009/5/26 : > changeset ecb875f82ef5 in /hg/icedtea > details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ecb875f82ef5 > description: > ? ? ? ?2009-05-26 ?Matthias Klose ? > > ? ? ? ? ? ? ? ?* patches/cacao/launcher.patch: Update for OpenJDK 7. > > diffstat: > > 2 files changed, 10 insertions(+), 8 deletions(-) > ChangeLog ? ? ? ? ? ? ? ? ? ?| ? ?4 ++++ > patches/cacao/launcher.patch | ? 14 ++++++-------- > > diffs (56 lines): > > diff -r 51313371451a -r ecb875f82ef5 ChangeLog > --- a/ChangeLog Mon May 25 00:26:26 2009 +0200 > +++ b/ChangeLog Tue May 26 23:54:58 2009 +0200 > @@ -1,3 +1,7 @@ 2009-05-24 ?Mark Wielaard ? +2009-05-26 ?Matthias Klose ? > + > + ? ? ? * patches/cacao/launcher.patch: Update for OpenJDK 7. > + > ?2009-05-24 ?Mark Wielaard ? > > ? ? ? ?* patches/xrender/icedtea-001.patch: Initialize X11SurfaceData > diff -r 51313371451a -r ecb875f82ef5 patches/cacao/launcher.patch > --- a/patches/cacao/launcher.patch ? ? ?Mon May 25 00:26:26 2009 +0200 > +++ b/patches/cacao/launcher.patch ? ? ?Tue May 26 23:54:58 2009 +0200 > @@ -10,9 +10,8 @@ diff -Nru openjdk.orig/jdk/make/docs/Mak > ?endif > > ?# > -diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c > ---- openjdk.orig/jdk/src/share/bin/java.c ? ? ?2009-05-19 01:11:05.000000000 +0100 > -+++ openjdk/jdk/src/share/bin/java.c ? 2009-05-20 20:22:14.000000000 +0100 > +--- openjdk/jdk/src/share/bin/java.c.orig ? ? ?2009-05-26 21:16:09.000000000 +0000 > ++++ openjdk/jdk/src/share/bin/java.c ? 2009-05-26 21:29:41.000000000 +0000 > ?@@ -175,6 +175,8 @@ > ? ?InvocationFunctions ifn; > ?} JavaMainArgs; > @@ -22,7 +21,7 @@ diff -Nru openjdk.orig/jdk/src/share/bin > ?/* > ? * Entry point. > ? */ > -@@ -1871,6 +1873,8 @@ > +@@ -1875,6 +1877,8 @@ > > ? ? ?{ /* Create a new thread to create JVM and invoke main method */ > ? ? ? ?JavaMainArgs args; > @@ -31,7 +30,7 @@ diff -Nru openjdk.orig/jdk/src/share/bin > ? ? ? ?int rslt; > > ? ? ? ?args.argc = argc; > -@@ -1879,7 +1883,18 @@ > +@@ -1883,7 +1887,17 @@ > ? ? ? ?args.classname = classname; > ? ? ? ?args.ifn = *ifn; > > @@ -39,9 +38,8 @@ diff -Nru openjdk.orig/jdk/src/share/bin > ?+ ? ? ?memset((void*)&cacao_args, 0, sizeof(cacao_args)); > ?+ ? ? ?cacao_args.version = JNI_VERSION_CACAO; > ?+ > -+ ? ? ?jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args); > -+ ? ? ?if (_launcher_debug) > -+ ? ? ? ? ?printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no"); > ++ ? ? ?jvm_init_rv = ifn->GetDefaultJavaVMInitArgs(&cacao_args); > ++ ? ? ?JLI_TraceLauncher("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no"); > ?+ > ?+ ? ? ?if (jvm_init_rv == 0) > ?+ ? ? ? ? ?return JavaMain((void*)&args); > Huh? I already recreated the patch against 7 before I committed 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 doko at ubuntu.com Wed May 27 00:07:11 2009 From: doko at ubuntu.com (Matthias Klose) Date: Wed, 27 May 2009 09:07:11 +0200 Subject: changeset in /hg/icedtea: 2009-05-26 Matthias Klose References: <17c6771e0905261525i52743190iee72d517d92d79e6@mail.gmail.com> Message-ID: <4A1CE69F.5090604@ubuntu.com> Andrew John Hughes schrieb: > 2009/5/26 : > Huh? I already recreated the patch against 7 before I committed it. maybe. but did you try to build with it? From bugzilla-daemon at icedtea.classpath.org Wed May 27 02:28:28 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:28:28 +0000 Subject: [Bug 337] New: icedtea7 20090527 fails to build zero Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=337 Summary: icedtea7 20090527 fails to build zero Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com fails building the precompiled header files: In file included from ../generated/incls/_precompiled.incl:9: /scratch/packages/openjdk/7/openjdk-7-7b59/build/zerovm/openjdk/hotspot/src/share/vm/runtime/globals.hpp:50: error: redefinition of 'const intx pd_InlineSmallCode' /scratch/packages/openjdk/7/openjdk-7-7b59/build/zerovm/openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp:47: error: 'const intx pd_InlineSmallCode' previously defined here make[9]: *** [incls/_precompiled.incl.gch] Error 1 -- 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 Wed May 27 02:31:31 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:31:31 +0000 Subject: [Bug 338] New: icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 Summary: icedtea7 20090527 fails to build using gcj Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com icedtea7 20090527 fails to build using gcj in jaxws -- 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 Wed May 27 02:31:57 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:31:57 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 ------- Comment #1 from doko at ubuntu.com 2009-05-27 09:31 ------- Created an attachment (id=215) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=215&action=view) build log -- 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 Wed May 27 02:39:43 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:39:43 +0000 Subject: [Bug 339] New: icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 Summary: icedtea7 20090527 fails to run the langtools and jdk testsuite Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com -- 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 Wed May 27 02:40:16 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:40:16 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #1 from doko at ubuntu.com 2009-05-27 09:40 ------- Created an attachment (id=216) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=216&action=view) log -- 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 Wed May 27 02:42:53 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:42:53 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #2 from doko at ubuntu.com 2009-05-27 09:42 ------- this is in a chroot, with /tmp in the chroot bind-mounted on /tmp: $ mount |grep tmp tmpfs on /lib/init/rw type tmpfs (rw,nosuid,mode=0755) varrun on /var/run type tmpfs (rw,nosuid,mode=0755) varlock on /var/lock type tmpfs (rw,noexec,nosuid,nodev,mode=1777) udev on /dev type tmpfs (rw,mode=0755) tmpfs on /dev/shm type tmpfs (rw,nosuid,nodev) devshm-karmiclp on /home/chroot/karmiclp/dev/shm type tmpfs (rw,nosuid,nodev) /tmp on /home/chroot/karmiclp/tmp type none (rw,bind) -- 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 Wed May 27 02:46:25 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:46:25 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #215|application/octet-stream |text/plain mime type| | -- 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 Wed May 27 02:47:24 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:47:24 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 ------- Comment #2 from mark at klomp.org 2009-05-27 09:47 ------- Could you add your full configure line? -- 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 Wed May 27 02:48:21 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:48:21 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #216|application/octet-stream |text/plain mime type| | -- 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 Wed May 27 02:48:43 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:48:43 +0000 Subject: [Bug 340] New: files with "ibm confidential" header files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=340 Summary: files with "ibm confidential" header files Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com IcedTea's fsg.sh still removes the following files: openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ openjdk/jdk/test/java/util/Locale/LocaleTest.java \ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java -- 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 Wed May 27 02:48:57 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:48:57 +0000 Subject: [Bug 340] files with "ibm confidential" header files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=340 ------- Comment #1 from doko at ubuntu.com 2009-05-27 09:48 ------- both 6 and 7 -- 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 Wed May 27 02:50:43 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:50:43 +0000 Subject: [Bug 341] New: questionable license headers in J2DBench Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=341 Summary: questionable license headers in J2DBench Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com still removed in fsg.sh, both 6 and 7: # Remove J2DBench sources, some of which have questionable license # headers. rm -rf \ openjdk/jdk/src/share/demo/java2d/J2DBench -- 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 Wed May 27 02:54:00 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:54:00 +0000 Subject: [Bug 342] New: copyright unclear for binary *.spp files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=342 Summary: copyright unclear for binary *.spp files Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com jdk/test/sun/net/idn/*.spp are binary files without copyright information. The .java files in the same directory are GPL'ed. The status of the *.spp files should be clarified. seen in 6 and 7. How can these files be built from source (if there exists some source for these)? -- 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 Wed May 27 02:54:28 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:54:28 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #3 from mark at klomp.org 2009-05-27 09:54 ------- That is weird, why does make check-hotspot work, but make check-langtools not? The only obvious difference I see is that langtools uses an execlude file. Could you remove that line from the Makefile and see if that makes a difference? That said, this does look like a bug in findMountEntry() in sun/nio/fs/LinuxFileStore.java. So what it is trying to do is find out what the temporary directory is as defined by java.io.tmpdir then it tries to see if it "isPosix()", which calls findMountEntry() and that falls flat on its face... -- 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 Wed May 27 02:54:59 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:54:59 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |340, 341, 342 -- 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 Wed May 27 02:54:59 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:54:59 +0000 Subject: [Bug 342] copyright unclear for binary *.spp files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=342 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- OtherBugsDependingO| |138 nThis| | -- 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 Wed May 27 02:54:59 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:54:59 +0000 Subject: [Bug 341] questionable license headers in J2DBench Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=341 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- OtherBugsDependingO| |138 nThis| | -- 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 Wed May 27 02:55:00 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 09:55:00 +0000 Subject: [Bug 340] files with "ibm confidential" header files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=340 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- OtherBugsDependingO| |138 nThis| | -- 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 Wed May 27 03:00:37 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 10:00:37 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #4 from doko at ubuntu.com 2009-05-27 10:00 ------- removing the -exclude list doesn"t make a difference -- 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 Wed May 27 03:06:28 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 10:06:28 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #5 from mark at klomp.org 2009-05-27 10:06 ------- This most likely comes from this giant changeset: http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/f06f30b29f36 -- 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 Wed May 27 03:24:40 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 10:24:40 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 ------- Comment #3 from doko at ubuntu.com 2009-05-27 10:24 ------- cd build && CACAO_CONFIGURE_ARGS='--host=i486-linux-gnu --build=i486-linux-gnu' LIBFFI_LIBS=-lffi_pic ../configure --with-icedtea --with-icedtea-home=/usr/lib/jvm/java-6-openjdk --with-pkgversion="7b59-0ubuntu1~ppa0.1" --with-xalan2-jar=/usr/share/java/xalan2.jar --with-xalan2-serializer-jar=/usr/share/java/serializer.jar --with-rhino=/usr/share/java/js.jar --with-openjdk-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/openjdk.tar.gz --with-hotspot-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/hotspot.tar.gz --with-corba-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/corba.tar.gz --with-jaxp-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jaxp.tar.gz --with-jaxws-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jaxws.tar.gz --with-jdk-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jdk-dfsg.tar.gz --with-langtools-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/langtools.tar.gz --with-cacao-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/cacao-0.99.4.tar.bz2 --with-hotspot-build --with-parallel-jobs=4 --enable-liveconnect --enable-pulse-java --with-additional-vms=cacao --host=i486-linux-gnu --build=i486-linux-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 Wed May 27 03:25:55 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 10:25:55 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #6 from mark at klomp.org 2009-05-27 10:25 ------- Looking at the jtreg sources this comes from: private synchronized void saveTestSuiteInfo() throws IOException { File f = File.createTempFile(TESTSUITE, ".new", jtData); where jtData is under test/langtools/JTwork. So could you give any details on how the build directory is mounted? -- 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 Wed May 27 03:27:40 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 10:27:40 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #7 from doko at ubuntu.com 2009-05-27 10:27 ------- the build directory is in a path, which is bind-mounted as well. $ mount | grep scratch /dev/sda7 on /scratch type ext3 (rw) /scratch on /home/chroot/karmiclp/scratch type none (rw,bind) -- 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 Wed May 27 03:35:25 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 10:35:25 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #8 from doko at ubuntu.com 2009-05-27 10:35 ------- in the chroot: $ cat /etc/mtab proc /proc proc rw 0 0 sysfs /sys sysfs rw 0 0 -- 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 Wed May 27 05:22:24 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 12:22:24 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 ------- Comment #4 from gnu_andrew at member.fsf.org 2009-05-27 12:22 ------- Those aren't the right configure arguments. Those are for a --with-icedtea build, yet your build log includes an openjdk-ecj bootstrap stage. Builds with gcj for me. -- 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 Wed May 27 05:45:04 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 12:45:04 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME -- 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 Wed May 27 05:45:56 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 27 May 2009 12:45:56 +0000 Subject: changeset in /hg/icedtea6: 2009-05-27 Gary Benson changeset c562fe339799 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c562fe339799 description: 2009-05-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp (SharkDecacher::location_type): New method. (SharkDecacher::stack_location_type): Use the above. (SharkDecacher::local_location_type): Use the above. diffstat: 2 files changed, 49 insertions(+), 10 deletions(-) ChangeLog | 7 ++ ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 52 ++++++++++++---- diffs (90 lines): diff -r 9293bf2e49a9 -r c562fe339799 ChangeLog --- a/ChangeLog Mon May 25 13:54:44 2009 -0400 +++ b/ChangeLog Wed May 27 13:47:05 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-25 Omair Majid + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp + (SharkDecacher::location_type): New method. + (SharkDecacher::stack_location_type): Use the above. + (SharkDecacher::local_location_type): Use the above. + 2009-05-25 Omair Majid * rt/net/sourceforge/jnlp/resources/Messages.properties: Add diff -r 9293bf2e49a9 -r c562fe339799 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Mon May 25 13:54:44 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Wed May 27 13:47:05 2009 +0100 @@ -151,6 +151,46 @@ class SharkDecacher : public SharkCacher { return new LocationValue(slot2loc(offset, type)); } + static Location::Type location_type(SharkValue** addr, bool maybe_two_word) + { + // low addresses this end + // Type 32-bit 64-bit + // ---------------------------------------------------- + // stack[0] local[3] jobject oop oop + // stack[1] local[2] NULL normal lng + // stack[2] local[1] jlong normal invalid + // stack[3] local[0] jint normal normal + // + // high addresses this end + + SharkValue *value = *addr; + if (value) { + if (value->is_jobject()) + return Location::oop; +#ifdef _LP64 + if (value->is_two_word()) + return Location::invalid; +#endif // _LP64 + return Location::normal; + } + else { + if (maybe_two_word) { + value = *(addr - 1); + if (value && value->is_two_word()) { +#ifdef _LP64 + if (value->is_jlong()) + return Location::lng; + if (value->is_jdouble()) + return Location::dbl; + ShouldNotReachHere(); +#else + return Location::normal; +#endif // _LP64 + } + } + return Location::invalid; + } + } // Stack slot helpers protected: @@ -160,9 +200,7 @@ class SharkDecacher : public SharkCacher static Location::Type stack_location_type(int index, SharkValue** addr) { - if (addr[0] && addr[0]->is_jobject()) - return Location::oop; - return Location::normal; + return location_type(addr, *addr == NULL); } // Local slot helpers @@ -173,13 +211,7 @@ class SharkDecacher : public SharkCacher static Location::Type local_location_type(int index, SharkValue** addr) { - if (addr[0] && addr[0]->is_jobject()) - return Location::oop; - if (addr[0]) - return Location::normal; - if (index > 0 && addr[-1] && addr[-1]->is_two_word()) - return Location::normal; - return Location::invalid; + return location_type(addr, index > 0); } // Writer helper From gbenson at redhat.com Wed May 27 05:49:16 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 27 May 2009 13:49:16 +0100 Subject: Shark 64-bit deoptimization fix Message-ID: <20090527124916.GB3217@redhat.com> Hi all, This commit fixes deoptimization in Shark on 64-bit platforms where the stack or local variables contain long and/or double values. Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r 9293bf2e49a9 -r c562fe339799 ChangeLog --- a/ChangeLog Mon May 25 13:54:44 2009 -0400 +++ b/ChangeLog Wed May 27 13:47:05 2009 +0100 @@ -1,3 +1,10 @@ +2009-05-27 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp + (SharkDecacher::location_type): New method. + (SharkDecacher::stack_location_type): Use the above. + (SharkDecacher::local_location_type): Use the above. + 2009-05-25 Omair Majid * rt/net/sourceforge/jnlp/resources/Messages.properties: Add diff -r 9293bf2e49a9 -r c562fe339799 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Mon May 25 13:54:44 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Wed May 27 13:47:05 2009 +0100 @@ -151,6 +151,46 @@ { return new LocationValue(slot2loc(offset, type)); } + static Location::Type location_type(SharkValue** addr, bool maybe_two_word) + { + // low addresses this end + // Type 32-bit 64-bit + // ---------------------------------------------------- + // stack[0] local[3] jobject oop oop + // stack[1] local[2] NULL normal lng + // stack[2] local[1] jlong normal invalid + // stack[3] local[0] jint normal normal + // + // high addresses this end + + SharkValue *value = *addr; + if (value) { + if (value->is_jobject()) + return Location::oop; +#ifdef _LP64 + if (value->is_two_word()) + return Location::invalid; +#endif // _LP64 + return Location::normal; + } + else { + if (maybe_two_word) { + value = *(addr - 1); + if (value && value->is_two_word()) { +#ifdef _LP64 + if (value->is_jlong()) + return Location::lng; + if (value->is_jdouble()) + return Location::dbl; + ShouldNotReachHere(); +#else + return Location::normal; +#endif // _LP64 + } + } + return Location::invalid; + } + } // Stack slot helpers protected: @@ -160,9 +200,7 @@ static Location::Type stack_location_type(int index, SharkValue** addr) { - if (addr[0] && addr[0]->is_jobject()) - return Location::oop; - return Location::normal; + return location_type(addr, *addr == NULL); } // Local slot helpers @@ -173,13 +211,7 @@ static Location::Type local_location_type(int index, SharkValue** addr) { - if (addr[0] && addr[0]->is_jobject()) - return Location::oop; - if (addr[0]) - return Location::normal; - if (index > 0 && addr[-1] && addr[-1]->is_two_word()) - return Location::normal; - return Location::invalid; + return location_type(addr, index > 0); } // Writer helper From gbenson at redhat.com Wed May 27 05:48:31 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 27 May 2009 12:48:31 +0000 Subject: changeset in /hg/icedtea6: ChangeLog fix Message-ID: changeset b22d229ddbcf in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b22d229ddbcf description: ChangeLog fix diffstat: 1 file changed, 1 insertion(+), 1 deletion(-) ChangeLog | 2 +- diffs (12 lines): diff -r c562fe339799 -r b22d229ddbcf ChangeLog --- a/ChangeLog Wed May 27 13:47:05 2009 +0100 +++ b/ChangeLog Wed May 27 13:49:38 2009 +0100 @@ -3,7 +3,7 @@ 2009-05-27 Gary Benson From bugzilla-daemon at icedtea.classpath.org Wed May 27 06:23:37 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 13:23:37 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #9 from gnu_andrew at member.fsf.org 2009-05-27 13:23 ------- Is /etc/mtab a regular file or a symlink to /proc/mounts? -- 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 Wed May 27 06:34:52 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 27 May 2009 14:34:52 +0100 Subject: changeset in /hg/icedtea: 2009-05-26 Matthias Klose References: <17c6771e0905261525i52743190iee72d517d92d79e6@mail.gmail.com> <4A1CE69F.5090604@ubuntu.com> Message-ID: <17c6771e0905270634w77b147ccx8a452dbac33a0e5f@mail.gmail.com> 2009/5/27 Matthias Klose : > Andrew John Hughes schrieb: >> 2009/5/26 ?: > >> Huh? I already recreated the patch against 7 before I committed it. > > maybe. but did you try to build with it? > No and I see now that there are some differences in the types that would cause it to break. It would help if your ChangeLog comments were a bit more descriptive; 'Update to OpenJDK7' just implies that the patch was regenerated against the source, not that the code had to be changed. -- 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 Wed May 27 06:37:05 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 13:37:05 +0000 Subject: [Bug 337] icedtea7 20090527 fails to build zero Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=337 ------- Comment #1 from gnu_andrew at member.fsf.org 2009-05-27 13:37 ------- It was building. It looks like fixing Shark broke Zero... :( -- 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 Wed May 27 06:38:25 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 13:38:25 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #10 from doko at ubuntu.com 2009-05-27 13:38 ------- regular file -- 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 Wed May 27 06:44:31 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 13:44:31 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 ------- Comment #11 from mark at klomp.org 2009-05-27 13:44 ------- As a workaround try symlinking /etc/mtab to /proc/mounts. It would probably be good to change the code to look in both places. It is a regression, this isn't an issue with icedtea6. I also started a discussion about this issue here: http://mail.openjdk.java.net/pipermail/nio-dev/2009-May/thread.html#545 -- 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 Wed May 27 06:59:24 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 13:59:24 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|WORKSFORME | ------- Comment #5 from doko at ubuntu.com 2009-05-27 13:59 ------- sorry, pasted wrong configure options. cd build && CACAO_CONFIGURE_ARGS='--host=i686-linux-gnulp --build=i686-linux-gnulp' LIBFFI_LIBS=-lffi_pic ../configure --with-gcj-home=/usr/lib/jvm/java-gcj --with-ecj=/usr/bin/ecj --with-java=/usr/lib/jvm/java-gcj/bin/java --with-javah=/usr/bin/gjavah-4.4 --with-rmic=/usr/bin/grmic-4.4 --with-jar=/usr/bin/fastjar --with-pkgversion="7b59-0ubuntu1~ppa0.1" --with-xalan2-jar=/usr/share/java/xalan2.jar --with-xalan2-serializer-jar=/usr/share/java/serializer.jar --with-rhino=/usr/share/java/js.jar --with-openjdk-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/openjdk.tar.gz --with-hotspot-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/hotspot.tar.gz --with-corba-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/corba.tar.gz --with-jaxp-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jaxp.tar.gz --with-jaxws-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jaxws.tar.gz --with-jdk-src-zip=/scratch/packages/cd build && CACAO_CONFIGURE_ARGS='--host=i686-linux-gnulp --build=i686-linux-gnulp' LIBFFI_LIBS=-lffi_pic ../configure --with-gcj-home=/usr/lib/jvm/java-gcj --with-ecj=/usr/bin/ecj --with-java=/usr/lib/jvm/java-gcj/bin/java --with-javah=/usr/bin/gjavah-4.4 --with-rmic=/usr/bin/grmic-4.4 --with-jar=/usr/bin/fastjar --with-pkgversion="7b59-0ubuntu1~ppa0.1" --with-xalan2-jar=/usr/share/java/xalan2.jar --with-xalan2-serializer-jar=/usr/share/java/serializer.jar --with-rhino=/usr/share/java/js.jar --with-openjdk-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/openjdk.tar.gz --with-hotspot-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/hotspot.tar.gz --with-corba-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/corba.tar.gz --with-jaxp-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jaxp.tar.gz --with-jaxws-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jaxws.tar.gz --with-jdk-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jdk-dfsg.tar.gz --with-langtools-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/langtools.tar.gz --with-cacao-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/cacao-0.99.4.tar.bz2 --with-hotspot-build --with-parallel-jobs=4 --enable-liveconnect --enable-pulse-java --with-additional-vms=cacao --host=i686-linux-gnulp --build=i686-linux-gnulp openjdk/7/openjdk-7-7b59/jdk-dfsg.tar.gz --with-langtools-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/langtools.tar.gz --with-cacao-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/cacao-0.99.4.tar.bz2 --with-hotspot-build --with-parallel-jobs=4 --enable-liveconnect --enable-pulse-java --with-additional-vms=cacao --host=i686-linux-gnulp --build=i686-linux-gnulp -- 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 Wed May 27 06:59:32 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 27 May 2009 13:59:32 +0000 Subject: changeset in /hg/icedtea6: 2009-05-27 Gary Benson changeset e805128be861 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e805128be861 description: 2009-05-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkFunction.hpp (SharkFunction::_monitor_count): Removed. (SharkFunction::_max_monitors): New field. (SharkFunction::monitor_count): Removed. (SharkFunction::max_monitors): New method. (SharkFunction::_exception_slot_offset): Removed. (SharkFunction::exception_slot): Likewise. (SharkFunction::_oop_tmp_slot_offset): New field. (SharkFunction::oop_tmp_slot_offset): New method. (SharkFunction::monitors_slots): Removed. (SharkFunction::monitors_slots_offset): Likewise. (SharkFunction::monitor_offset): New method. (SharkFunction::monitor_object_offset): Likewise. (SharkFunction::monitor_header_offset): Likewise. (SharkFunction::monitor_addr): Likewise. (SharkFunction::monitor_object_addr): Likewise. (SharkFunction::monitor_header_addr): Likewise. * ports/hotspot/src/share/vm/shark/sharkFunction.cpp (SharkFunction::initialize): Renamed _monitor_count as _max_monitors. (SharkFunction::CreateBuildFrame): Renamed _monitor_count as _max_monitors, remove monitor initialization, remove exception pointer and add temporary oop slot. (SharkFunction::monitor): Removed. * ports/hotspot/src/share/vm/shark/sharkState.hpp (SharkState::_num_monitors): New field. (SharkState::max_monitors): New method. (SharkState::num_monitors): Likewise. (SharkState::set_num_monitors): Likewise. (SharkState::_oop_tmp): New field. (SharkState::oop_tmp_addr): New method. (SharkState::oop_tmp): Likewise. (SharkState::set_oop_tmp): Likewise. * ports/hotspot/src/share/vm/shark/sharkState.inline.hpp (SharkState::max_monitors): New method. * ports/hotspot/src/share/vm/shark/sharkState.cpp (SharkState::SharkState): Initialize oop_tmp. (SharkState::initialize): Initialize num_monitors. (SharkPHIState::SharkPHIState): Likewise. (SharkState::equal_to): Also check oop_tmp and num_monitors. (SharkPHIState::add_incoming): Likewise. (SharkState::merge): Also merge oop_tmp and check num_monitors. * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp (SharkStateScanner::process_monitor): New argument. (SharkStateScanner::process_oop_tmp_slot): New method. (SharkStateScanner::process_exception_slot): Removed. * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp (SharkStateScanner::scan): Replace monitor scanning, remove exception slot, and add temporary oop slot. * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp (SharkDecacher::process_monitor): New argument. (SharkDecacher::process_oop_tmp_slot): New method. (SharkCacher::process_oop_tmp_slot): Likewise. (SharkDecacher::process_exception_slot): Removed. * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp (SharkDecacher::process_monitor): New argument. (SharkDecacher::process_oop_tmp_slot): New method. (SharkCacher::process_oop_tmp_slot): Likewise. (SharkDecacher::process_exception_slot): Removed. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::set_oop_tmp): New method. (SharkTopLevelBlock::get_oop_tmp): Likewise. (SharkTopLevelBlock::num_monitors): Likewise. (SharkTopLevelBlock::set_num_monitors): Likewise. (SharkTopLevelBlock::release_method_lock): Removed. (SharkTopLevelBlock::release_locked_monitors): Likewise. (SharkTopLevelBlock::acquire_lock): New method. (SharkTopLevelBlock::release_lock): Likewise. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::acquire_method_lock): Rewritten. (SharkTopLevelBlock::release_method_lock): Removed. (SharkTopLevelBlock::release_locked_monitors): Likewise. (SharkTopLevelBlock::handle_return): New monitor release code. (SharkTopLevelBlock::do_monitorenter): Rewritten. (SharkTopLevelBlock::do_monitorexit): Likewise. (SharkTopLevelBlock::acquire_lock): New method. (SharkTopLevelBlock::release_lock): Likewise. * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp (SharkFrame::Layout): Replaced exception slot with oop_tmp slot. * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp (ZeroStackPrinter::print_word): Likewise. * ports/hotspot/src/share/vm/shark/sharkMonitor.hpp: Removed. * ports/hotspot/src/share/vm/shark/sharkMonitor.cpp: Likewise. * ports/hotspot/src/share/vm/includeDB_shark: Updated. * patches/hotspot/default/icedtea-shark.patch (vframeArrayElement::fill_in): Remove workaround for unused but recorded monitors. (vframeArrayElement::unpack_on_stack): Likewise. diffstat: 18 files changed, 488 insertions(+), 565 deletions(-) ChangeLog | 98 ++++ patches/hotspot/default/icedtea-shark.patch | 26 - ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp | 4 ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 4 ports/hotspot/src/share/vm/includeDB_shark | 15 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 48 +- ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 7 ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 53 -- ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 87 ++-- ports/hotspot/src/share/vm/shark/sharkMonitor.cpp | 170 ------- ports/hotspot/src/share/vm/shark/sharkMonitor.hpp | 94 ---- ports/hotspot/src/share/vm/shark/sharkState.cpp | 35 + ports/hotspot/src/share/vm/shark/sharkState.hpp | 29 + ports/hotspot/src/share/vm/shark/sharkState.inline.hpp | 5 ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 13 ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 6 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 320 ++++++++------- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 39 + diffs (truncated from 1470 to 500 lines): diff -r b22d229ddbcf -r e805128be861 ChangeLog --- a/ChangeLog Wed May 27 13:49:38 2009 +0100 +++ b/ChangeLog Wed May 27 15:00:40 2009 +0100 @@ -1,3 +1,101 @@ 2009-05-27 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkFunction.hpp + (SharkFunction::_monitor_count): Removed. + (SharkFunction::_max_monitors): New field. + (SharkFunction::monitor_count): Removed. + (SharkFunction::max_monitors): New method. + (SharkFunction::_exception_slot_offset): Removed. + (SharkFunction::exception_slot): Likewise. + (SharkFunction::_oop_tmp_slot_offset): New field. + (SharkFunction::oop_tmp_slot_offset): New method. + (SharkFunction::monitors_slots): Removed. + (SharkFunction::monitors_slots_offset): Likewise. + (SharkFunction::monitor_offset): New method. + (SharkFunction::monitor_object_offset): Likewise. + (SharkFunction::monitor_header_offset): Likewise. + (SharkFunction::monitor_addr): Likewise. + (SharkFunction::monitor_object_addr): Likewise. + (SharkFunction::monitor_header_addr): Likewise. + * ports/hotspot/src/share/vm/shark/sharkFunction.cpp + (SharkFunction::initialize): Renamed _monitor_count as _max_monitors. + (SharkFunction::CreateBuildFrame): Renamed _monitor_count as + _max_monitors, remove monitor initialization, remove exception + pointer and add temporary oop slot. + (SharkFunction::monitor): Removed. + + * ports/hotspot/src/share/vm/shark/sharkState.hpp + (SharkState::_num_monitors): New field. + (SharkState::max_monitors): New method. + (SharkState::num_monitors): Likewise. + (SharkState::set_num_monitors): Likewise. + (SharkState::_oop_tmp): New field. + (SharkState::oop_tmp_addr): New method. + (SharkState::oop_tmp): Likewise. + (SharkState::set_oop_tmp): Likewise. + * ports/hotspot/src/share/vm/shark/sharkState.inline.hpp + (SharkState::max_monitors): New method. + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkState::SharkState): Initialize oop_tmp. + (SharkState::initialize): Initialize num_monitors. + (SharkPHIState::SharkPHIState): Likewise. + (SharkState::equal_to): Also check oop_tmp and num_monitors. + (SharkPHIState::add_incoming): Likewise. + (SharkState::merge): Also merge oop_tmp and check num_monitors. + + * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp + (SharkStateScanner::process_monitor): New argument. + (SharkStateScanner::process_oop_tmp_slot): New method. + (SharkStateScanner::process_exception_slot): Removed. + * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp + (SharkStateScanner::scan): Replace monitor scanning, remove + exception slot, and add temporary oop slot. + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp + (SharkDecacher::process_monitor): New argument. + (SharkDecacher::process_oop_tmp_slot): New method. + (SharkCacher::process_oop_tmp_slot): Likewise. + (SharkDecacher::process_exception_slot): Removed. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkDecacher::process_monitor): New argument. + (SharkDecacher::process_oop_tmp_slot): New method. + (SharkCacher::process_oop_tmp_slot): Likewise. + (SharkDecacher::process_exception_slot): Removed. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::set_oop_tmp): New method. + (SharkTopLevelBlock::get_oop_tmp): Likewise. + (SharkTopLevelBlock::num_monitors): Likewise. + (SharkTopLevelBlock::set_num_monitors): Likewise. + (SharkTopLevelBlock::release_method_lock): Removed. + (SharkTopLevelBlock::release_locked_monitors): Likewise. + (SharkTopLevelBlock::acquire_lock): New method. + (SharkTopLevelBlock::release_lock): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::acquire_method_lock): Rewritten. + (SharkTopLevelBlock::release_method_lock): Removed. + (SharkTopLevelBlock::release_locked_monitors): Likewise. + (SharkTopLevelBlock::handle_return): New monitor release code. + (SharkTopLevelBlock::do_monitorenter): Rewritten. + (SharkTopLevelBlock::do_monitorexit): Likewise. + (SharkTopLevelBlock::acquire_lock): New method. + (SharkTopLevelBlock::release_lock): Likewise. + + * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp + (SharkFrame::Layout): Replaced exception slot with oop_tmp slot. + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp + (ZeroStackPrinter::print_word): Likewise. + + * ports/hotspot/src/share/vm/shark/sharkMonitor.hpp: Removed. + * ports/hotspot/src/share/vm/shark/sharkMonitor.cpp: Likewise. + + * ports/hotspot/src/share/vm/includeDB_shark: Updated. + + * patches/hotspot/default/icedtea-shark.patch + (vframeArrayElement::fill_in): Remove workaround for + unused but recorded monitors. + (vframeArrayElement::unpack_on_stack): Likewise. + 2009-05-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp diff -r b22d229ddbcf -r e805128be861 patches/hotspot/default/icedtea-shark.patch --- a/patches/hotspot/default/icedtea-shark.patch Wed May 27 13:49:38 2009 +0100 +++ b/patches/hotspot/default/icedtea-shark.patch Wed May 27 15:00:40 2009 +0100 @@ -56,32 +56,6 @@ {0, NULL, NULL} }; ---- openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp.orig 2008-11-22 00:11:18.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp 2008-12-03 14:33:49.000000000 +0000 -@@ -64,6 +64,11 @@ - assert(monitor->owner() == NULL || (!monitor->owner()->is_unlocked() && !monitor->owner()->has_bias_pattern()), "object must be null or locked, and unbiased"); - BasicObjectLock* dest = _monitors->at(index); - dest->set_obj(monitor->owner()); -+#ifdef SHARK -+ // XXX This can be removed when Shark knows -+ // which monitors are in use. -+ if (monitor->owner()) -+#endif // SHARK - monitor->lock()->move_to(monitor->owner(), dest->lock()); - } - } -@@ -262,6 +267,11 @@ - top = iframe()->previous_monitor_in_interpreter_frame(top); - BasicObjectLock* src = _monitors->at(index); - top->set_obj(src->obj()); -+#ifdef SHARK -+ // XXX This can be removed when Shark knows -+ // which monitors are in use. -+ if (src->obj()) -+#endif // SHARK - src->lock()->move_to(src->obj(), top->lock()); - } - if (ProfileInterpreter) { --- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-12-03 14:23:37.000000000 +0000 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-03 14:33:48.000000000 +0000 @@ -94,6 +94,9 @@ diff -r b22d229ddbcf -r e805128be861 ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp Wed May 27 15:00:40 2009 +0100 @@ -31,7 +31,7 @@ // | monitor m-1 | // | ... | // | monitor 0 | -// | exception | +// | oop_tmp | // | method | // | unextended_sp | // | pc | @@ -55,7 +55,7 @@ class SharkFrame : public ZeroFrame { pc_off = jf_header_words, unextended_sp_off, method_off, - exception_off, + oop_tmp_off, header_words }; diff -r b22d229ddbcf -r e805128be861 ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Wed May 27 15:00:40 2009 +0100 @@ -222,8 +222,8 @@ class ZeroStackPrinter { if (method->is_oop()) value = method->name_and_sig_as_C_string(_buf, _buflen); } - else if (word == SharkFrame::exception_off) { - field = "exception"; + else if (word == SharkFrame::oop_tmp_off) { + field = "oop_tmp"; } else { SharkFrame *sf = (SharkFrame *) frame; diff -r b22d229ddbcf -r e805128be861 ports/hotspot/src/share/vm/includeDB_shark --- a/ports/hotspot/src/share/vm/includeDB_shark Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/includeDB_shark Wed May 27 15:00:40 2009 +0100 @@ -193,7 +193,6 @@ sharkFunction.cpp sharkFunction.cpp sharkBuilder.hpp sharkFunction.cpp sharkEntry.hpp sharkFunction.cpp sharkFunction.hpp -sharkFunction.cpp sharkMonitor.hpp sharkFunction.cpp sharkState.inline.hpp sharkFunction.cpp sharkTopLevelBlock.hpp @@ -240,19 +239,6 @@ sharkMemoryManager.cpp sharkMemoryManager.cpp llvmHeaders.hpp sharkMemoryManager.cpp sharkEntry.hpp sharkMemoryManager.cpp sharkMemoryManager.hpp - -sharkMonitor.cpp llvmHeaders.hpp -sharkMonitor.cpp llvmValue.hpp -sharkMonitor.cpp sharkMonitor.hpp -sharkMonitor.cpp sharkRuntime.hpp -sharkMonitor.cpp sharkState.inline.hpp -sharkMonitor.cpp sharkTopLevelBlock.hpp - -sharkMonitor.hpp allocation.hpp -sharkMonitor.hpp llvmHeaders.hpp -sharkMonitor.hpp llvmValue.hpp -sharkMonitor.hpp sharkBuilder.hpp -sharkMonitor.hpp sharkFunction.hpp sharkRuntime.cpp biasedLocking.hpp sharkRuntime.cpp deoptimization.hpp @@ -326,7 +312,6 @@ sharkTopLevelBlock.hpp sharkTopLevelBlock.hpp sharkBlock.hpp sharkTopLevelBlock.hpp sharkBuilder.hpp sharkTopLevelBlock.hpp sharkFunction.hpp -sharkTopLevelBlock.hpp sharkMonitor.hpp sharkTopLevelBlock.hpp sharkState.inline.hpp sharkTopLevelBlock.hpp sharkValue.hpp diff -r b22d229ddbcf -r e805128be861 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Wed May 27 15:00:40 2009 +0100 @@ -82,11 +82,8 @@ void SharkDecacher::start_monitors(int n _monarray = new GrowableArray(num_monitors); } -void SharkDecacher::process_monitor(int index, int box_offset) -{ - int obj_offset = - box_offset + (BasicObjectLock::obj_offset_in_bytes() >> LogBytesPerWord); - +void SharkDecacher::process_monitor(int index, int box_offset, int obj_offset) +{ oopmap()->set_oop(slot2reg(obj_offset)); monarray()->append(new MonitorValue( @@ -94,13 +91,20 @@ void SharkDecacher::process_monitor(int slot2loc(box_offset, Location::normal))); } -void SharkDecacher::process_exception_slot(int offset) -{ - // Record the exception slot - oopmap()->set_oop(slot2reg(offset)); -} - -void SharkDecacher::process_method_slot(llvm::Value** value, int offset) +void SharkDecacher::process_oop_tmp_slot(Value** value, int offset) +{ + // Decache the temporary oop slot + if (*value) { + write_value_to_frame( + SharkType::oop_type(), + *value, + offset); + + oopmap()->set_oop(slot2reg(offset)); + } +} + +void SharkDecacher::process_method_slot(Value** value, int offset) { // Decache the method pointer write_value_to_frame( @@ -182,14 +186,20 @@ void SharkCacher::process_stack_slot(int } } -void SharkCacher::process_method_slot(llvm::Value** value, int offset) +void SharkCacher::process_oop_tmp_slot(Value** value, int offset) +{ + // Cache the temporary oop + if (*value) + *value = read_value_from_frame(SharkType::oop_type(), offset); +} + +void SharkCacher::process_method_slot(Value** value, int offset) { // Cache the method pointer *value = read_value_from_frame(SharkType::methodOop_type(), offset); } -void SharkFunctionEntryCacher::process_method_slot(llvm::Value** value, - int offset) +void SharkFunctionEntryCacher::process_method_slot(Value** value, int offset) { // "Cache" the method pointer *value = method(); @@ -212,9 +222,9 @@ void SharkCacher::process_local_slot(int } } -void SharkDecacher::write_value_to_frame(const llvm::Type* type, - llvm::Value* value, - int offset) +void SharkDecacher::write_value_to_frame(const Type* type, + Value* value, + int offset) { if (frame_cache()->value(offset) != value) { builder()->CreateStore( @@ -223,7 +233,7 @@ void SharkDecacher::write_value_to_frame } } -Value* SharkCacher::read_value_from_frame(const llvm::Type* type, int offset) +Value* SharkCacher::read_value_from_frame(const Type* type, int offset) { Value *result = builder()->CreateLoad( function()->CreateAddressOfFrameEntry(offset, type)); diff -r b22d229ddbcf -r e805128be861 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Wed May 27 15:00:40 2009 +0100 @@ -122,9 +122,9 @@ class SharkDecacher : public SharkCacher void process_stack_slot(int index, SharkValue** value, int offset); void start_monitors(int num_monitors); - void process_monitor(int index, int offset); - - void process_exception_slot(int offset); + void process_monitor(int index, int box_offset, int obj_offset); + + void process_oop_tmp_slot(llvm::Value** value, int offset); void process_method_slot(llvm::Value** value, int offset); void process_pc_slot(int offset); @@ -354,6 +354,7 @@ class SharkCacher : public SharkCacherDe protected: void process_stack_slot(int index, SharkValue** value, int offset); + void process_oop_tmp_slot(llvm::Value** value, int offset); virtual void process_method_slot(llvm::Value** value, int offset); void process_local_slot(int index, SharkValue** value, int offset); diff -r b22d229ddbcf -r e805128be861 ports/hotspot/src/share/vm/shark/sharkFunction.cpp --- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Wed May 27 15:00:40 2009 +0100 @@ -53,15 +53,16 @@ void SharkFunction::initialize() // Create the list of blocks set_block_insertion_point(NULL); _blocks = NEW_RESOURCE_ARRAY(SharkTopLevelBlock*, flow()->block_count()); - for (int i = 0; i < block_count(); i++) - { - ciTypeFlow::Block *b = flow()->pre_order_at(i); - // Work around a bug in pre_order_at() that does not return the - // correct pre-ordering. If pre_order_at() were correct this - // line could simply be: - // _blocks[i] = new SharkTopLevelBlock(this, b); - _blocks[b->pre_order()] = new SharkTopLevelBlock(this, b); - } + for (int i = 0; i < block_count(); i++) { + ciTypeFlow::Block *b = flow()->pre_order_at(i); + + // Work around a bug in pre_order_at() that does not return + // the correct pre-ordering. If pre_order_at() were correct + // this line could simply be: + // _blocks[i] = new SharkTopLevelBlock(this, b); + _blocks[b->pre_order()] = new SharkTopLevelBlock(this, b); + } + // Walk the tree from the start block to determine which // blocks are entered and which blocks require phis SharkTopLevelBlock *start_block = block(0); @@ -75,11 +76,11 @@ void SharkFunction::initialize() } // Initialize the monitors - _monitor_count = 0; + _max_monitors = 0; if (target()->is_synchronized() || target()->uses_monitors()) { for (int i = 0; i < block_count(); i++) - _monitor_count = MAX2( - _monitor_count, block(i)->ciblock()->monitor_count()); + _max_monitors = MAX2( + _max_monitors, block(i)->ciblock()->monitor_count()); } // Create the method preamble @@ -216,7 +217,7 @@ Value* SharkFunction::CreateBuildFrame() int locals_words = max_locals(); int extra_locals = locals_words - arg_size(); int header_words = SharkFrame::header_words; - int monitor_words = monitor_count()*frame::interpreter_frame_monitor_size(); + int monitor_words = max_monitors()*frame::interpreter_frame_monitor_size(); int stack_words = max_stack(); int frame_words = header_words + monitor_words + stack_words; @@ -242,19 +243,11 @@ Value* SharkFunction::CreateBuildFrame() offset += stack_words; // Monitors - if (monitor_count()) { - _monitors_slots_offset = offset; - - for (int i = 0; i < monitor_count(); i++) { - if (i != 0 || !target()->is_synchronized()) - monitor(i)->mark_free(); - } - } + _monitors_slots_offset = offset; offset += monitor_words; - // Exception pointer - _exception_slot_offset = offset++; - builder()->CreateStore(LLVMValue::null(), exception_slot()); + // Temporary oop slot + _oop_tmp_slot_offset = offset++; // Method pointer _method_slot_offset = offset++; @@ -295,18 +288,6 @@ Value* SharkFunction::CreateAddressOfFra result, PointerType::getUnqual(type), name); } return result; -} - -SharkMonitor* SharkFunction::monitor(Value *index) const -{ - Value *indexes[] = { - LLVMValue::jint_constant(0), - builder()->CreateSub( - LLVMValue::jint_constant(monitor_count() - 1), index), - }; - return new SharkMonitor( - this, - builder()->CreateGEP(monitors_slots(), indexes, indexes + 2)); } class DeferredZeroCheck : public ResourceObj { diff -r b22d229ddbcf -r e805128be861 ports/hotspot/src/share/vm/shark/sharkFunction.hpp --- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Wed May 27 15:00:40 2009 +0100 @@ -23,7 +23,6 @@ * */ -class SharkMonitor; class SharkTopLevelBlock; class DeferredZeroCheck; @@ -55,7 +54,7 @@ class SharkFunction : public StackObj { SharkTopLevelBlock** _blocks; llvm::Value* _base_pc; llvm::Value* _thread; - int _monitor_count; + int _max_monitors; GrowableArray _deferred_zero_checks; public: @@ -95,9 +94,9 @@ class SharkFunction : public StackObj { { return _thread; } - int monitor_count() const - { - return _monitor_count; + int max_monitors() const + { + return _max_monitors; } GrowableArray* deferred_zero_checks() { @@ -215,29 +214,6 @@ class SharkFunction : public StackObj { llvm::Value* CreateAddressOfFrameEntry(int offset, const llvm::Type* type = NULL, const char* name = "") const; - public: - llvm::Value* exception_slot() const - { - return CreateAddressOfFrameEntry( - exception_slot_offset(), - SharkType::oop_type(), - "exception_slot"); - } - llvm::Value* monitors_slots() const - { - return CreateAddressOfFrameEntry( - monitors_slots_offset(), - llvm::ArrayType::get(SharkType::monitor_type(), monitor_count()), - "monitors"); - } - - public: - SharkMonitor* monitor(int index) const - { - return monitor(LLVMValue::jint_constant(index)); - } - SharkMonitor* monitor(llvm::Value* index) const; - private: llvm::Value* CreateBuildFrame(); @@ -256,7 +232,7 @@ class SharkFunction : public StackObj { int _extended_frame_size; int _stack_slots_offset; int _monitors_slots_offset; - int _exception_slot_offset; + int _oop_tmp_slot_offset; int _method_slot_offset; int _pc_slot_offset; int _locals_slots_offset; @@ -274,13 +250,9 @@ class SharkFunction : public StackObj { { return _stack_slots_offset; From gbenson at redhat.com Wed May 27 07:03:54 2009 From: gbenson at redhat.com (Gary Benson) Date: Wed, 27 May 2009 15:03:54 +0100 Subject: Shark monitor improvements Message-ID: <20090527140354.GA20259@redhat.com> Hi all, Monitors are used in Java bytecode for synchronization. Previously, Shark handled monitors in a similar manner to the C++ interpreter, and a lot of the work of monitor allocation was performed at runtime. With this commit, a lot of that work is handled at compile time. Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r b22d229ddbcf ChangeLog --- a/ChangeLog Wed May 27 13:49:38 2009 +0100 +++ b/ChangeLog Wed May 27 14:59:07 2009 +0100 @@ -1,3 +1,101 @@ +2009-05-27 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkFunction.hpp + (SharkFunction::_monitor_count): Removed. + (SharkFunction::_max_monitors): New field. + (SharkFunction::monitor_count): Removed. + (SharkFunction::max_monitors): New method. + (SharkFunction::_exception_slot_offset): Removed. + (SharkFunction::exception_slot): Likewise. + (SharkFunction::_oop_tmp_slot_offset): New field. + (SharkFunction::oop_tmp_slot_offset): New method. + (SharkFunction::monitors_slots): Removed. + (SharkFunction::monitors_slots_offset): Likewise. + (SharkFunction::monitor_offset): New method. + (SharkFunction::monitor_object_offset): Likewise. + (SharkFunction::monitor_header_offset): Likewise. + (SharkFunction::monitor_addr): Likewise. + (SharkFunction::monitor_object_addr): Likewise. + (SharkFunction::monitor_header_addr): Likewise. + * ports/hotspot/src/share/vm/shark/sharkFunction.cpp + (SharkFunction::initialize): Renamed _monitor_count as _max_monitors. + (SharkFunction::CreateBuildFrame): Renamed _monitor_count as + _max_monitors, remove monitor initialization, remove exception + pointer and add temporary oop slot. + (SharkFunction::monitor): Removed. + + * ports/hotspot/src/share/vm/shark/sharkState.hpp + (SharkState::_num_monitors): New field. + (SharkState::max_monitors): New method. + (SharkState::num_monitors): Likewise. + (SharkState::set_num_monitors): Likewise. + (SharkState::_oop_tmp): New field. + (SharkState::oop_tmp_addr): New method. + (SharkState::oop_tmp): Likewise. + (SharkState::set_oop_tmp): Likewise. + * ports/hotspot/src/share/vm/shark/sharkState.inline.hpp + (SharkState::max_monitors): New method. + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkState::SharkState): Initialize oop_tmp. + (SharkState::initialize): Initialize num_monitors. + (SharkPHIState::SharkPHIState): Likewise. + (SharkState::equal_to): Also check oop_tmp and num_monitors. + (SharkPHIState::add_incoming): Likewise. + (SharkState::merge): Also merge oop_tmp and check num_monitors. + + * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp + (SharkStateScanner::process_monitor): New argument. + (SharkStateScanner::process_oop_tmp_slot): New method. + (SharkStateScanner::process_exception_slot): Removed. + * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp + (SharkStateScanner::scan): Replace monitor scanning, remove + exception slot, and add temporary oop slot. + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp + (SharkDecacher::process_monitor): New argument. + (SharkDecacher::process_oop_tmp_slot): New method. + (SharkCacher::process_oop_tmp_slot): Likewise. + (SharkDecacher::process_exception_slot): Removed. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkDecacher::process_monitor): New argument. + (SharkDecacher::process_oop_tmp_slot): New method. + (SharkCacher::process_oop_tmp_slot): Likewise. + (SharkDecacher::process_exception_slot): Removed. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::set_oop_tmp): New method. + (SharkTopLevelBlock::get_oop_tmp): Likewise. + (SharkTopLevelBlock::num_monitors): Likewise. + (SharkTopLevelBlock::set_num_monitors): Likewise. + (SharkTopLevelBlock::release_method_lock): Removed. + (SharkTopLevelBlock::release_locked_monitors): Likewise. + (SharkTopLevelBlock::acquire_lock): New method. + (SharkTopLevelBlock::release_lock): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::acquire_method_lock): Rewritten. + (SharkTopLevelBlock::release_method_lock): Removed. + (SharkTopLevelBlock::release_locked_monitors): Likewise. + (SharkTopLevelBlock::handle_return): New monitor release code. + (SharkTopLevelBlock::do_monitorenter): Rewritten. + (SharkTopLevelBlock::do_monitorexit): Likewise. + (SharkTopLevelBlock::acquire_lock): New method. + (SharkTopLevelBlock::release_lock): Likewise. + + * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp + (SharkFrame::Layout): Replaced exception slot with oop_tmp slot. + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp + (ZeroStackPrinter::print_word): Likewise. + + * ports/hotspot/src/share/vm/shark/sharkMonitor.hpp: Removed. + * ports/hotspot/src/share/vm/shark/sharkMonitor.cpp: Likewise. + + * ports/hotspot/src/share/vm/includeDB_shark: Updated. + + * patches/hotspot/default/icedtea-shark.patch + (vframeArrayElement::fill_in): Remove workaround for + unused but recorded monitors. + (vframeArrayElement::unpack_on_stack): Likewise. + 2009-05-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp diff -r b22d229ddbcf patches/hotspot/default/icedtea-shark.patch --- a/patches/hotspot/default/icedtea-shark.patch Wed May 27 13:49:38 2009 +0100 +++ b/patches/hotspot/default/icedtea-shark.patch Wed May 27 14:59:07 2009 +0100 @@ -56,32 +56,6 @@ {0, NULL, NULL} }; ---- openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp.orig 2008-11-22 00:11:18.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp 2008-12-03 14:33:49.000000000 +0000 -@@ -64,6 +64,11 @@ - assert(monitor->owner() == NULL || (!monitor->owner()->is_unlocked() && !monitor->owner()->has_bias_pattern()), "object must be null or locked, and unbiased"); - BasicObjectLock* dest = _monitors->at(index); - dest->set_obj(monitor->owner()); -+#ifdef SHARK -+ // XXX This can be removed when Shark knows -+ // which monitors are in use. -+ if (monitor->owner()) -+#endif // SHARK - monitor->lock()->move_to(monitor->owner(), dest->lock()); - } - } -@@ -262,6 +267,11 @@ - top = iframe()->previous_monitor_in_interpreter_frame(top); - BasicObjectLock* src = _monitors->at(index); - top->set_obj(src->obj()); -+#ifdef SHARK -+ // XXX This can be removed when Shark knows -+ // which monitors are in use. -+ if (src->obj()) -+#endif // SHARK - src->lock()->move_to(src->obj(), top->lock()); - } - if (ProfileInterpreter) { --- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-12-03 14:23:37.000000000 +0000 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-03 14:33:48.000000000 +0000 @@ -94,6 +94,9 @@ diff -r b22d229ddbcf ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp Wed May 27 14:59:07 2009 +0100 @@ -31,7 +31,7 @@ // | monitor m-1 | // | ... | // | monitor 0 | -// | exception | +// | oop_tmp | // | method | // | unextended_sp | // | pc | @@ -55,7 +55,7 @@ pc_off = jf_header_words, unextended_sp_off, method_off, - exception_off, + oop_tmp_off, header_words }; diff -r b22d229ddbcf ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Wed May 27 14:59:07 2009 +0100 @@ -222,8 +222,8 @@ if (method->is_oop()) value = method->name_and_sig_as_C_string(_buf, _buflen); } - else if (word == SharkFrame::exception_off) { - field = "exception"; + else if (word == SharkFrame::oop_tmp_off) { + field = "oop_tmp"; } else { SharkFrame *sf = (SharkFrame *) frame; diff -r b22d229ddbcf ports/hotspot/src/share/vm/includeDB_shark --- a/ports/hotspot/src/share/vm/includeDB_shark Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/includeDB_shark Wed May 27 14:59:07 2009 +0100 @@ -193,7 +193,6 @@ sharkFunction.cpp sharkBuilder.hpp sharkFunction.cpp sharkEntry.hpp sharkFunction.cpp sharkFunction.hpp -sharkFunction.cpp sharkMonitor.hpp sharkFunction.cpp sharkState.inline.hpp sharkFunction.cpp sharkTopLevelBlock.hpp @@ -241,19 +240,6 @@ sharkMemoryManager.cpp sharkEntry.hpp sharkMemoryManager.cpp sharkMemoryManager.hpp -sharkMonitor.cpp llvmHeaders.hpp -sharkMonitor.cpp llvmValue.hpp -sharkMonitor.cpp sharkMonitor.hpp -sharkMonitor.cpp sharkRuntime.hpp -sharkMonitor.cpp sharkState.inline.hpp -sharkMonitor.cpp sharkTopLevelBlock.hpp - -sharkMonitor.hpp allocation.hpp -sharkMonitor.hpp llvmHeaders.hpp -sharkMonitor.hpp llvmValue.hpp -sharkMonitor.hpp sharkBuilder.hpp -sharkMonitor.hpp sharkFunction.hpp - sharkRuntime.cpp biasedLocking.hpp sharkRuntime.cpp deoptimization.hpp sharkRuntime.cpp llvmHeaders.hpp @@ -326,7 +312,6 @@ sharkTopLevelBlock.hpp sharkBlock.hpp sharkTopLevelBlock.hpp sharkBuilder.hpp sharkTopLevelBlock.hpp sharkFunction.hpp -sharkTopLevelBlock.hpp sharkMonitor.hpp sharkTopLevelBlock.hpp sharkState.inline.hpp sharkTopLevelBlock.hpp sharkValue.hpp diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Wed May 27 14:59:07 2009 +0100 @@ -82,11 +82,8 @@ _monarray = new GrowableArray(num_monitors); } -void SharkDecacher::process_monitor(int index, int box_offset) +void SharkDecacher::process_monitor(int index, int box_offset, int obj_offset) { - int obj_offset = - box_offset + (BasicObjectLock::obj_offset_in_bytes() >> LogBytesPerWord); - oopmap()->set_oop(slot2reg(obj_offset)); monarray()->append(new MonitorValue( @@ -94,13 +91,20 @@ slot2loc(box_offset, Location::normal))); } -void SharkDecacher::process_exception_slot(int offset) +void SharkDecacher::process_oop_tmp_slot(Value** value, int offset) { - // Record the exception slot - oopmap()->set_oop(slot2reg(offset)); + // Decache the temporary oop slot + if (*value) { + write_value_to_frame( + SharkType::oop_type(), + *value, + offset); + + oopmap()->set_oop(slot2reg(offset)); + } } -void SharkDecacher::process_method_slot(llvm::Value** value, int offset) +void SharkDecacher::process_method_slot(Value** value, int offset) { // Decache the method pointer write_value_to_frame( @@ -182,14 +186,20 @@ } } -void SharkCacher::process_method_slot(llvm::Value** value, int offset) +void SharkCacher::process_oop_tmp_slot(Value** value, int offset) +{ + // Cache the temporary oop + if (*value) + *value = read_value_from_frame(SharkType::oop_type(), offset); +} + +void SharkCacher::process_method_slot(Value** value, int offset) { // Cache the method pointer *value = read_value_from_frame(SharkType::methodOop_type(), offset); } -void SharkFunctionEntryCacher::process_method_slot(llvm::Value** value, - int offset) +void SharkFunctionEntryCacher::process_method_slot(Value** value, int offset) { // "Cache" the method pointer *value = method(); @@ -212,9 +222,9 @@ } } -void SharkDecacher::write_value_to_frame(const llvm::Type* type, - llvm::Value* value, - int offset) +void SharkDecacher::write_value_to_frame(const Type* type, + Value* value, + int offset) { if (frame_cache()->value(offset) != value) { builder()->CreateStore( @@ -223,7 +233,7 @@ } } -Value* SharkCacher::read_value_from_frame(const llvm::Type* type, int offset) +Value* SharkCacher::read_value_from_frame(const Type* type, int offset) { Value *result = builder()->CreateLoad( function()->CreateAddressOfFrameEntry(offset, type)); diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Wed May 27 14:59:07 2009 +0100 @@ -122,9 +122,9 @@ void process_stack_slot(int index, SharkValue** value, int offset); void start_monitors(int num_monitors); - void process_monitor(int index, int offset); + void process_monitor(int index, int box_offset, int obj_offset); - void process_exception_slot(int offset); + void process_oop_tmp_slot(llvm::Value** value, int offset); void process_method_slot(llvm::Value** value, int offset); void process_pc_slot(int offset); @@ -354,6 +354,7 @@ protected: void process_stack_slot(int index, SharkValue** value, int offset); + void process_oop_tmp_slot(llvm::Value** value, int offset); virtual void process_method_slot(llvm::Value** value, int offset); void process_local_slot(int index, SharkValue** value, int offset); diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkFunction.cpp --- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Wed May 27 14:59:07 2009 +0100 @@ -53,15 +53,16 @@ // Create the list of blocks set_block_insertion_point(NULL); _blocks = NEW_RESOURCE_ARRAY(SharkTopLevelBlock*, flow()->block_count()); - for (int i = 0; i < block_count(); i++) - { - ciTypeFlow::Block *b = flow()->pre_order_at(i); - // Work around a bug in pre_order_at() that does not return the - // correct pre-ordering. If pre_order_at() were correct this - // line could simply be: - // _blocks[i] = new SharkTopLevelBlock(this, b); - _blocks[b->pre_order()] = new SharkTopLevelBlock(this, b); - } + for (int i = 0; i < block_count(); i++) { + ciTypeFlow::Block *b = flow()->pre_order_at(i); + + // Work around a bug in pre_order_at() that does not return + // the correct pre-ordering. If pre_order_at() were correct + // this line could simply be: + // _blocks[i] = new SharkTopLevelBlock(this, b); + _blocks[b->pre_order()] = new SharkTopLevelBlock(this, b); + } + // Walk the tree from the start block to determine which // blocks are entered and which blocks require phis SharkTopLevelBlock *start_block = block(0); @@ -75,11 +76,11 @@ } // Initialize the monitors - _monitor_count = 0; + _max_monitors = 0; if (target()->is_synchronized() || target()->uses_monitors()) { for (int i = 0; i < block_count(); i++) - _monitor_count = MAX2( - _monitor_count, block(i)->ciblock()->monitor_count()); + _max_monitors = MAX2( + _max_monitors, block(i)->ciblock()->monitor_count()); } // Create the method preamble @@ -216,7 +217,7 @@ int locals_words = max_locals(); int extra_locals = locals_words - arg_size(); int header_words = SharkFrame::header_words; - int monitor_words = monitor_count()*frame::interpreter_frame_monitor_size(); + int monitor_words = max_monitors()*frame::interpreter_frame_monitor_size(); int stack_words = max_stack(); int frame_words = header_words + monitor_words + stack_words; @@ -242,19 +243,11 @@ offset += stack_words; // Monitors - if (monitor_count()) { - _monitors_slots_offset = offset; - - for (int i = 0; i < monitor_count(); i++) { - if (i != 0 || !target()->is_synchronized()) - monitor(i)->mark_free(); - } - } + _monitors_slots_offset = offset; offset += monitor_words; - // Exception pointer - _exception_slot_offset = offset++; - builder()->CreateStore(LLVMValue::null(), exception_slot()); + // Temporary oop slot + _oop_tmp_slot_offset = offset++; // Method pointer _method_slot_offset = offset++; @@ -297,18 +290,6 @@ return result; } -SharkMonitor* SharkFunction::monitor(Value *index) const -{ - Value *indexes[] = { - LLVMValue::jint_constant(0), - builder()->CreateSub( - LLVMValue::jint_constant(monitor_count() - 1), index), - }; - return new SharkMonitor( - this, - builder()->CreateGEP(monitors_slots(), indexes, indexes + 2)); -} - class DeferredZeroCheck : public ResourceObj { public: DeferredZeroCheck(SharkTopLevelBlock* block, SharkValue* value) diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkFunction.hpp --- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Wed May 27 14:59:07 2009 +0100 @@ -23,7 +23,6 @@ * */ -class SharkMonitor; class SharkTopLevelBlock; class DeferredZeroCheck; @@ -55,7 +54,7 @@ SharkTopLevelBlock** _blocks; llvm::Value* _base_pc; llvm::Value* _thread; - int _monitor_count; + int _max_monitors; GrowableArray _deferred_zero_checks; public: @@ -95,9 +94,9 @@ { return _thread; } - int monitor_count() const + int max_monitors() const { - return _monitor_count; + return _max_monitors; } GrowableArray* deferred_zero_checks() { @@ -215,29 +214,6 @@ llvm::Value* CreateAddressOfFrameEntry(int offset, const llvm::Type* type = NULL, const char* name = "") const; - public: - llvm::Value* exception_slot() const - { - return CreateAddressOfFrameEntry( - exception_slot_offset(), - SharkType::oop_type(), - "exception_slot"); - } - llvm::Value* monitors_slots() const - { - return CreateAddressOfFrameEntry( - monitors_slots_offset(), - llvm::ArrayType::get(SharkType::monitor_type(), monitor_count()), - "monitors"); - } - - public: - SharkMonitor* monitor(int index) const - { - return monitor(LLVMValue::jint_constant(index)); - } - SharkMonitor* monitor(llvm::Value* index) const; - private: llvm::Value* CreateBuildFrame(); @@ -256,7 +232,7 @@ int _extended_frame_size; int _stack_slots_offset; int _monitors_slots_offset; - int _exception_slot_offset; + int _oop_tmp_slot_offset; int _method_slot_offset; int _pc_slot_offset; int _locals_slots_offset; @@ -274,13 +250,9 @@ { return _stack_slots_offset; } - int monitors_slots_offset() const + int oop_tmp_slot_offset() const { - return _monitors_slots_offset; - } - int exception_slot_offset() const - { - return _exception_slot_offset; + return _oop_tmp_slot_offset; } int method_slot_offset() const { @@ -295,6 +267,49 @@ return _locals_slots_offset; } + // Monitors + public: + int monitor_offset(int index) const + { + assert(index >= 0 && index < max_monitors(), "invalid monitor index"); + return _monitors_slots_offset + + (max_monitors() - 1 - index) * frame::interpreter_frame_monitor_size(); + } + int monitor_object_offset(int index) const + { + return monitor_offset(index) + + (BasicObjectLock::obj_offset_in_bytes() >> LogBytesPerWord); + } + int monitor_header_offset(int index) const + { + return monitor_offset(index) + + ((BasicObjectLock::lock_offset_in_bytes() + + BasicLock::displaced_header_offset_in_bytes()) >> LogBytesPerWord); + } + + public: + llvm::Value* monitor_addr(int index) const + { + return CreateAddressOfFrameEntry( + monitor_offset(index), + SharkType::monitor_type(), + "monitor"); + } + llvm::Value* monitor_object_addr(int index) const + { + return CreateAddressOfFrameEntry( + monitor_object_offset(index), + SharkType::oop_type(), + "object_addr"); + } + llvm::Value* monitor_header_addr(int index) const + { + return CreateAddressOfFrameEntry( + monitor_header_offset(index), + SharkType::intptr_type(), + "displaced_header_addr"); + } + // VM interface private: llvm::StoreInst* CreateStoreLastJavaSP(llvm::Value* value) const diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkMonitor.cpp --- a/ports/hotspot/src/share/vm/shark/sharkMonitor.cpp Wed May 27 13:49:38 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,170 +0,0 @@ -/* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 Red Hat, Inc. - * 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. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - */ - -#include "incls/_precompiled.incl" -#include "incls/_sharkMonitor.cpp.incl" - -using namespace llvm; - -void SharkMonitor::initialize() -{ - _object_addr = builder()->CreateAddressOfStructEntry( - monitor(), in_ByteSize(BasicObjectLock::obj_offset_in_bytes()), - PointerType::getUnqual(SharkType::oop_type()), - "object_addr"); - - _displaced_header_addr = builder()->CreateAddressOfStructEntry( - monitor(), in_ByteSize( - BasicObjectLock::lock_offset_in_bytes() + - BasicLock::displaced_header_offset_in_bytes()), - PointerType::getUnqual(SharkType::intptr_type()), - "displaced_header_addr"); -} - -void SharkMonitor::acquire(SharkTopLevelBlock* block, Value *lockee) const -{ - BasicBlock *try_recursive = function()->CreateBlock("try_recursive"); - BasicBlock *got_recursive = function()->CreateBlock("got_recursive"); - BasicBlock *not_recursive = function()->CreateBlock("not_recursive"); - BasicBlock *acquired_fast = function()->CreateBlock("acquired_fast"); - BasicBlock *lock_acquired = function()->CreateBlock("lock_acquired"); - - set_object(lockee); - - Value *lock = builder()->CreatePtrToInt( - displaced_header_addr(), SharkType::intptr_type()); - - Value *mark_addr = builder()->CreateAddressOfStructEntry( - lockee, in_ByteSize(oopDesc::mark_offset_in_bytes()), - PointerType::getUnqual(SharkType::intptr_type()), - "mark_addr"); - - Value *mark = builder()->CreateLoad(mark_addr, "mark"); - Value *disp = builder()->CreateOr( - mark, LLVMValue::intptr_constant(markOopDesc::unlocked_value), "disp"); - set_displaced_header(disp); - - // Try a simple lock - Value *check = builder()->CreateCmpxchgPtr(lock, mark_addr, disp); - builder()->CreateCondBr( - builder()->CreateICmpEQ(disp, check), - acquired_fast, try_recursive); - - // Locking failed, but maybe this thread already owns it - builder()->SetInsertPoint(try_recursive); - Value *addr = builder()->CreateAnd( - disp, - LLVMValue::intptr_constant(~markOopDesc::lock_mask_in_place)); - - // NB we use the entire stack, but JavaThread::is_lock_owned() - // uses a more limited range. I don't think it hurts though... - Value *stack_limit = builder()->CreateValueOfStructEntry( - function()->thread(), Thread::stack_base_offset(), - SharkType::intptr_type(), - "stack_limit"); - - assert(sizeof(size_t) == sizeof(intptr_t), "should be"); - Value *stack_size = builder()->CreateValueOfStructEntry( - function()->thread(), Thread::stack_size_offset(), - SharkType::intptr_type(), - "stack_size"); - - Value *stack_start = - builder()->CreateSub(stack_limit, stack_size, "stack_start"); - - builder()->CreateCondBr( - builder()->CreateAnd( - builder()->CreateICmpUGE(addr, stack_start), - builder()->CreateICmpULT(addr, stack_limit)), - got_recursive, not_recursive); - - builder()->SetInsertPoint(got_recursive); - set_displaced_header(LLVMValue::intptr_constant(0)); - builder()->CreateBr(acquired_fast); - - // Create an edge for the state merge - builder()->SetInsertPoint(acquired_fast); - SharkState *fast_state = block->current_state()->copy(); - builder()->CreateBr(lock_acquired); - - // It's not a recursive case so we need to drop into the runtime - builder()->SetInsertPoint(not_recursive); - block->call_vm_nocheck(SharkRuntime::monitorenter(), monitor()); - BasicBlock *acquired_slow = builder()->GetInsertBlock(); - builder()->CreateBr(lock_acquired); - - // All done - builder()->SetInsertPoint(lock_acquired); - block->current_state()->merge(fast_state, acquired_fast, acquired_slow); -} - -void SharkMonitor::release(SharkTopLevelBlock* block) const -{ - BasicBlock *not_recursive = function()->CreateBlock("not_recursive"); - BasicBlock *released_fast = function()->CreateBlock("released_fast"); - BasicBlock *slow_path = function()->CreateBlock("slow_path"); - BasicBlock *lock_released = function()->CreateBlock("lock_released"); - - Value *disp = displaced_header(); - Value *lockee = object(); - set_object(LLVMValue::null()); - - // If it is recursive then we're already done - builder()->CreateCondBr( - builder()->CreateICmpEQ(disp, LLVMValue::intptr_constant(0)), - released_fast, not_recursive); - - // Try a simple unlock - builder()->SetInsertPoint(not_recursive); - - Value *lock = builder()->CreatePtrToInt( - displaced_header_addr(), SharkType::intptr_type()); - - Value *mark_addr = builder()->CreateAddressOfStructEntry( - lockee, in_ByteSize(oopDesc::mark_offset_in_bytes()), - PointerType::getUnqual(SharkType::intptr_type()), - "mark_addr"); - - Value *check = builder()->CreateCmpxchgPtr(disp, mark_addr, lock); - builder()->CreateCondBr( - builder()->CreateICmpEQ(lock, check), - released_fast, slow_path); - - // Create an edge for the state merge - builder()->SetInsertPoint(released_fast); - SharkState *fast_state = block->current_state()->copy(); - builder()->CreateBr(lock_released); - - // Need to drop into the runtime to release this one - builder()->SetInsertPoint(slow_path); - set_object(lockee); - block->call_vm_nocheck(SharkRuntime::monitorexit(), monitor()); - BasicBlock *released_slow = builder()->GetInsertBlock(); - builder()->CreateBr(lock_released); - - // All done - builder()->SetInsertPoint(lock_released); - block->current_state()->merge(fast_state, released_fast, released_slow); -} diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkMonitor.hpp --- a/ports/hotspot/src/share/vm/shark/sharkMonitor.hpp Wed May 27 13:49:38 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 Red Hat, Inc. - * 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. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - */ - -class SharkTopLevelBlock; - -class SharkMonitor : public ResourceObj { - public: - SharkMonitor(const SharkFunction* function, llvm::Value* monitor) - : _function(function), _monitor(monitor) - { initialize(); } - - private: - void initialize(); - - private: - const SharkFunction* _function; - llvm::Value* _monitor; - llvm::Value* _object_addr; - llvm::Value* _displaced_header_addr; - - private: - const SharkFunction* function() const - { - return _function; - } - llvm::Value* monitor() const - { - return _monitor; - } - llvm::Value* object_addr() const - { - return _object_addr; - } - llvm::Value* displaced_header_addr() const - { - return _displaced_header_addr; - } - - public: - SharkBuilder* builder() const - { - return function()->builder(); - } - - public: - llvm::Value* object() const - { - return builder()->CreateLoad(object_addr()); - } - void set_object(llvm::Value* object) const - { - builder()->CreateStore(object, object_addr()); - } - llvm::Value* displaced_header() const - { - return builder()->CreateLoad(displaced_header_addr()); - } - void set_displaced_header(llvm::Value* displaced_header) const - { - builder()->CreateStore(displaced_header, displaced_header_addr()); - } - - public: - void mark_free() const - { - set_object(LLVMValue::null()); - } - - public: - void acquire(SharkTopLevelBlock* block, llvm::Value* lockee) const; - void release(SharkTopLevelBlock* block) const; -}; diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkState.cpp --- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Wed May 27 14:59:07 2009 +0100 @@ -32,6 +32,7 @@ : _block(block), _function(function), _method(NULL), + _oop_tmp(NULL), _frame_cache(NULL) { initialize(NULL); @@ -41,6 +42,7 @@ : _block(block), _function(state->function()), _method(state->method()), + _oop_tmp(state->oop_tmp()), _frame_cache(NULL) { initialize(state); @@ -76,6 +78,8 @@ else if (function()) { _frame_cache = new SharkFrameCache(function()); } + + set_num_monitors(state ? state->num_monitors() : 0); } bool SharkState::equal_to(SharkState *other) @@ -89,12 +93,18 @@ if (method() != other->method()) return false; + if (oop_tmp() != other->oop_tmp()) + return false; + if (max_locals() != other->max_locals()) return false; if (stack_depth() != other->stack_depth()) return false; + if (num_monitors() != other->num_monitors()) + return false; + // Local variables for (int i = 0; i < max_locals(); i++) { SharkValue *value = local(i); @@ -161,6 +171,20 @@ set_method(phi); } + // Temporary oop slot + Value *this_oop_tmp = this->oop_tmp(); + Value *other_oop_tmp = other->oop_tmp(); + if (this_oop_tmp != other_oop_tmp) { + assert(this_oop_tmp && other_oop_tmp, "can't merge NULL with non-NULL"); + PHINode *phi = builder()->CreatePHI(SharkType::oop_type(), "oop_tmp"); + phi->addIncoming(this_oop_tmp, this_block); + phi->addIncoming(other_oop_tmp, other_block); + set_oop_tmp(phi); + } + + // Monitors + assert(this->num_monitors() == other->num_monitors(), "should be"); + // Local variables assert(this->max_locals() == other->max_locals(), "should be"); for (int i = 0; i < max_locals(); i++) { @@ -365,6 +389,9 @@ push(value); } + // Monitors + set_num_monitors(block->ciblock()->monitor_count()); + builder()->SetInsertPoint(saved_insert_point); } @@ -389,4 +416,10 @@ if (stack(i)) stack(i)->addIncoming(incoming_state->stack(i), predecessor); } + + // Monitors + assert(num_monitors() == incoming_state->num_monitors(), "should be"); + + // Temporary oop slot + assert(oop_tmp() == incoming_state->oop_tmp(), "should be"); } diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkState.hpp --- a/ports/hotspot/src/share/vm/shark/sharkState.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkState.hpp Wed May 27 14:59:07 2009 +0100 @@ -43,6 +43,8 @@ SharkValue** _locals; SharkValue** _stack; SharkValue** _sp; + int _num_monitors; + llvm::Value* _oop_tmp; public: SharkBlock *block() const @@ -62,6 +64,7 @@ inline SharkBuilder* builder() const; inline int max_locals() const; inline int max_stack() const; + inline int max_monitors() const; // Method public: @@ -132,6 +135,32 @@ _sp -= slots; } + // Monitors + public: + int num_monitors() const + { + return _num_monitors; + } + void set_num_monitors(int num_monitors) + { + _num_monitors = num_monitors; + } + + // Temporary oop slot + public: + llvm::Value** oop_tmp_addr() + { + return &_oop_tmp; + } + llvm::Value* oop_tmp() const + { + return _oop_tmp; + } + void set_oop_tmp(llvm::Value* oop_tmp) + { + _oop_tmp = oop_tmp; + } + // Comparison public: bool equal_to(SharkState* other); diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkState.inline.hpp --- a/ports/hotspot/src/share/vm/shark/sharkState.inline.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkState.inline.hpp Wed May 27 14:59:07 2009 +0100 @@ -37,3 +37,8 @@ { return block()->max_stack(); } + +inline int SharkState::max_monitors() const +{ + return function()->max_monitors(); +} diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp --- a/ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp Wed May 27 14:59:07 2009 +0100 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 Red Hat, Inc. + * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,18 +45,19 @@ end_stack(); // Monitors - start_monitors(function()->monitor_count()); - for (int i = 0; i < function()->monitor_count(); i++) { + start_monitors(state->num_monitors()); + for (int i = 0; i < state->num_monitors(); i++) { process_monitor( i, - function()->monitors_slots_offset() + - i * frame::interpreter_frame_monitor_size()); + function()->monitor_offset(i), + function()->monitor_object_offset(i)); } end_monitors(); // Frame header start_frame_header(); - process_exception_slot(function()->exception_slot_offset()); + process_oop_tmp_slot( + state->oop_tmp_addr(), function()->oop_tmp_slot_offset()); process_method_slot(state->method_addr(), function()->method_slot_offset()); process_pc_slot(function()->pc_slot_offset()); end_frame_header(); diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp --- a/ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp Wed May 27 14:59:07 2009 +0100 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 Red Hat, Inc. + * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -54,11 +54,11 @@ virtual void end_stack() {} virtual void start_monitors(int num_monitors) {} - virtual void process_monitor(int index, int offset) {} + virtual void process_monitor(int index, int box_offset, int obj_offset) {} virtual void end_monitors() {} virtual void start_frame_header() {} - virtual void process_exception_slot(int offset) {} + virtual void process_oop_tmp_slot(llvm::Value** value, int offset) {} virtual void process_method_slot(llvm::Value** value, int offset) {} virtual void process_pc_slot(int offset) {} virtual void end_frame_header() {} diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Wed May 27 14:59:07 2009 +0100 @@ -205,34 +205,6 @@ _entry_block = function()->CreateBlock(name); } -void SharkTopLevelBlock::acquire_method_lock() -{ - Value *object; - if (target()->is_static()) { - SharkConstantPool constants(this); - object = constants.java_mirror(); - } - else { - object = local(0)->jobject_value(); - } - iter()->force_bci(start()); // for the decache - function()->monitor(0)->acquire(this, object); - check_pending_exception(false); -} - -void SharkTopLevelBlock::release_method_lock() -{ - function()->monitor(0)->release(this); - - // We neither need nor want to check for pending exceptions here. - // This method is only called by handle_return, which copes with - // them implicitly: - // - if a value is being returned then we just carry on as normal; - // the caller will see the pending exception and handle it. - // - if an exception is being thrown then that exception takes - // priority and ours will be ignored. -} - void SharkTopLevelBlock::emit_IR() { builder()->SetInsertPoint(entry_block()); @@ -544,15 +516,25 @@ { assert (exception == NULL || type == T_VOID, "exception OR result, please"); - if (exception) - builder()->CreateStore(exception, function()->exception_slot()); + if (num_monitors()) { + // Protect our exception across possible monitor release decaches + if (exception) + set_oop_tmp(exception); - release_locked_monitors(); - if (target()->is_synchronized()) - release_method_lock(); - + // We don't need to check for exceptions thrown here. If + // we're returning a value then we just carry on as normal: + // the caller will see the pending exception and handle it. + // If we're returning with an exception then that exception + // takes priority and the release_lock one will be ignored. + while (num_monitors()) + release_lock(); + + // Reload the exception we're throwing + if (exception) + exception = get_oop_tmp(); + } + if (exception) { - exception = builder()->CreateLoad(function()->exception_slot()); builder()->CreateStore(exception, function()->pending_exception_address()); } @@ -568,26 +550,6 @@ builder()->CreateRetVoid(); } -void SharkTopLevelBlock::release_locked_monitors() -{ - int base = target()->is_synchronized(); - for (int i = function()->monitor_count() - 1; i >= base; i--) { - BasicBlock *locked = function()->CreateBlock("locked"); - BasicBlock *unlocked = function()->CreateBlock("unlocked"); - - Value *object = function()->monitor(i)->object(); - builder()->CreateCondBr( - builder()->CreateICmpNE(object, LLVMValue::null()), - locked, unlocked); - - builder()->SetInsertPoint(locked); - builder()->CreateUnimplemented(__FILE__, __LINE__); - builder()->CreateUnreachable(); - - builder()->SetInsertPoint(unlocked); - } -} - Value *SharkTopLevelBlock::lookup_for_ldc() { int index = iter()->get_constant_index(); @@ -1583,102 +1545,166 @@ array_klass, function()->CreateGetVMResult(), true)); } +void SharkTopLevelBlock::acquire_method_lock() +{ + iter()->force_bci(start()); // for the decache in acquire_lock + if (target()->is_static()) { + SharkConstantPool constants(this); + acquire_lock(constants.java_mirror()); + } + else { + acquire_lock(local(0)->jobject_value()); + } + check_pending_exception(false); +} + void SharkTopLevelBlock::do_monitorenter() { SharkValue *lockee = pop(); check_null(lockee); - Value *object = lockee->jobject_value(); - - // Find a free monitor, or one already allocated for this object - BasicBlock *loop_top = function()->CreateBlock("loop_top"); - BasicBlock *loop_iter = function()->CreateBlock("loop_iter"); - BasicBlock *loop_check = function()->CreateBlock("loop_check"); - BasicBlock *no_monitor = function()->CreateBlock("no_monitor"); - BasicBlock *got_monitor = function()->CreateBlock("got_monitor"); - - BasicBlock *entry_block = builder()->GetInsertBlock(); - builder()->CreateBr(loop_check); - - builder()->SetInsertPoint(loop_check); - PHINode *index = builder()->CreatePHI(SharkType::jint_type(), "index"); - index->addIncoming( - LLVMValue::jint_constant(function()->monitor_count() - 1), entry_block); - builder()->CreateCondBr( - builder()->CreateICmpUGE(index, LLVMValue::jint_constant(0)), - loop_top, no_monitor); - - builder()->SetInsertPoint(loop_top); - SharkMonitor* monitor = function()->monitor(index); - Value *smo = monitor->object(); - builder()->CreateCondBr( - builder()->CreateOr( - builder()->CreateICmpEQ(smo, LLVMValue::null()), - builder()->CreateICmpEQ(smo, object)), - got_monitor, loop_iter); - - builder()->SetInsertPoint(loop_iter); - index->addIncoming( - builder()->CreateSub(index, LLVMValue::jint_constant(1)), loop_iter); - builder()->CreateBr(loop_check); - - builder()->SetInsertPoint(no_monitor); - builder()->CreateShouldNotReachHere(__FILE__, __LINE__); - builder()->CreateUnreachable(); - - // Acquire the lock - builder()->SetInsertPoint(got_monitor); - monitor->acquire(this, object); - check_pending_exception(); + acquire_lock(lockee->jobject_value()); } void SharkTopLevelBlock::do_monitorexit() { - SharkValue *lockee = pop(); - // The monitorexit can't throw an NPE because the verifier checks - // that the monitor operations are block structured before we - // compile. - // check_null(lockee); - Value *object = lockee->jobject_value(); + pop(); // don't need this (monitors are block structured) + release_lock(); +} - // Find the monitor associated with this object - BasicBlock *loop_top = function()->CreateBlock("loop_top"); - BasicBlock *loop_iter = function()->CreateBlock("loop_iter"); - BasicBlock *loop_check = function()->CreateBlock("loop_check"); - BasicBlock *no_monitor = function()->CreateBlock("no_monitor"); - BasicBlock *got_monitor = function()->CreateBlock("got_monitor"); +void SharkTopLevelBlock::acquire_lock(Value *lockee) +{ + BasicBlock *try_recursive = function()->CreateBlock("try_recursive"); + BasicBlock *got_recursive = function()->CreateBlock("got_recursive"); + BasicBlock *not_recursive = function()->CreateBlock("not_recursive"); + BasicBlock *acquired_fast = function()->CreateBlock("acquired_fast"); + BasicBlock *lock_acquired = function()->CreateBlock("lock_acquired"); - BasicBlock *entry_block = builder()->GetInsertBlock(); - builder()->CreateBr(loop_check); + int monitor = num_monitors(); + Value *monitor_addr = function()->monitor_addr(monitor); + Value *monitor_object_addr = function()->monitor_object_addr(monitor); + Value *monitor_header_addr = function()->monitor_header_addr(monitor); - builder()->SetInsertPoint(loop_check); - PHINode *index = builder()->CreatePHI(SharkType::jint_type(), "index"); - index->addIncoming( - LLVMValue::jint_constant(function()->monitor_count() - 1), entry_block); + // Store the object and mark the slot as live + builder()->CreateStore(lockee, monitor_object_addr); + set_num_monitors(monitor + 1); + + // Try a simple lock + Value *mark_addr = builder()->CreateAddressOfStructEntry( + lockee, in_ByteSize(oopDesc::mark_offset_in_bytes()), + PointerType::getUnqual(SharkType::intptr_type()), + "mark_addr"); + + Value *mark = builder()->CreateLoad(mark_addr, "mark"); + Value *disp = builder()->CreateOr( + mark, LLVMValue::intptr_constant(markOopDesc::unlocked_value), "disp"); + builder()->CreateStore(disp, monitor_header_addr); + + Value *lock = builder()->CreatePtrToInt( + monitor_header_addr, SharkType::intptr_type()); + Value *check = builder()->CreateCmpxchgPtr(lock, mark_addr, disp); builder()->CreateCondBr( - builder()->CreateICmpUGE(index, LLVMValue::jint_constant(0)), - loop_top, no_monitor); + builder()->CreateICmpEQ(disp, check), + acquired_fast, try_recursive); - builder()->SetInsertPoint(loop_top); - SharkMonitor* monitor = function()->monitor(index); - Value *smo = monitor->object(); + // Locking failed, but maybe this thread already owns it + builder()->SetInsertPoint(try_recursive); + Value *addr = builder()->CreateAnd( + disp, + LLVMValue::intptr_constant(~markOopDesc::lock_mask_in_place)); + + // NB we use the entire stack, but JavaThread::is_lock_owned() + // uses a more limited range. I don't think it hurts though... + Value *stack_limit = builder()->CreateValueOfStructEntry( + function()->thread(), Thread::stack_base_offset(), + SharkType::intptr_type(), + "stack_limit"); + + assert(sizeof(size_t) == sizeof(intptr_t), "should be"); + Value *stack_size = builder()->CreateValueOfStructEntry( + function()->thread(), Thread::stack_size_offset(), + SharkType::intptr_type(), + "stack_size"); + + Value *stack_start = + builder()->CreateSub(stack_limit, stack_size, "stack_start"); + builder()->CreateCondBr( - builder()->CreateICmpEQ(smo, object), - got_monitor, loop_iter); + builder()->CreateAnd( + builder()->CreateICmpUGE(addr, stack_start), + builder()->CreateICmpULT(addr, stack_limit)), + got_recursive, not_recursive); - builder()->SetInsertPoint(loop_iter); - index->addIncoming( - builder()->CreateSub(index, LLVMValue::jint_constant(1)), loop_iter); - builder()->CreateBr(loop_check); + builder()->SetInsertPoint(got_recursive); + builder()->CreateStore(LLVMValue::intptr_constant(0), monitor_header_addr); + builder()->CreateBr(acquired_fast); - builder()->SetInsertPoint(no_monitor); - builder()->CreateShouldNotReachHere(__FILE__, __LINE__); - builder()->CreateUnreachable(); + // Create an edge for the state merge + builder()->SetInsertPoint(acquired_fast); + SharkState *fast_state = current_state()->copy(); + builder()->CreateBr(lock_acquired); - // Release the lock - builder()->SetInsertPoint(got_monitor); - monitor->release(this); - // The monitorexit can't throw an NPE because the verifier checks - // that the monitor operations are block structured before we - // compile. - // check_pending_exception(); + // It's not a recursive case so we need to drop into the runtime + builder()->SetInsertPoint(not_recursive); + call_vm_nocheck(SharkRuntime::monitorenter(), monitor_addr); + BasicBlock *acquired_slow = builder()->GetInsertBlock(); + builder()->CreateBr(lock_acquired); + + // All done + builder()->SetInsertPoint(lock_acquired); + current_state()->merge(fast_state, acquired_fast, acquired_slow); } + +void SharkTopLevelBlock::release_lock() +{ + BasicBlock *not_recursive = function()->CreateBlock("not_recursive"); + BasicBlock *released_fast = function()->CreateBlock("released_fast"); + BasicBlock *slow_path = function()->CreateBlock("slow_path"); + BasicBlock *lock_released = function()->CreateBlock("lock_released"); + + int monitor = num_monitors() - 1; + Value *monitor_addr = function()->monitor_addr(monitor); + Value *monitor_object_addr = function()->monitor_object_addr(monitor); + Value *monitor_header_addr = function()->monitor_header_addr(monitor); + + // If it is recursive then we're already done + Value *disp = builder()->CreateLoad(monitor_header_addr); + builder()->CreateCondBr( + builder()->CreateICmpEQ(disp, LLVMValue::intptr_constant(0)), + released_fast, not_recursive); + + // Try a simple unlock + builder()->SetInsertPoint(not_recursive); + + Value *lock = builder()->CreatePtrToInt( + monitor_header_addr, SharkType::intptr_type()); + + Value *lockee = builder()->CreateLoad(monitor_object_addr); + + Value *mark_addr = builder()->CreateAddressOfStructEntry( + lockee, in_ByteSize(oopDesc::mark_offset_in_bytes()), + PointerType::getUnqual(SharkType::intptr_type()), + "mark_addr"); + + Value *check = builder()->CreateCmpxchgPtr(disp, mark_addr, lock); + builder()->CreateCondBr( + builder()->CreateICmpEQ(lock, check), + released_fast, slow_path); + + // Create an edge for the state merge + builder()->SetInsertPoint(released_fast); + SharkState *fast_state = current_state()->copy(); + builder()->CreateBr(lock_released); + + // Need to drop into the runtime to release this one + builder()->SetInsertPoint(slow_path); + call_vm_nocheck(SharkRuntime::monitorexit(), monitor_addr); + BasicBlock *released_slow = builder()->GetInsertBlock(); + builder()->CreateBr(lock_released); + + // All done + builder()->SetInsertPoint(lock_released); + current_state()->merge(fast_state, released_fast, released_slow); + + // The object slot is now dead + set_num_monitors(monitor); +} diff -r b22d229ddbcf ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Wed May 27 13:49:38 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Wed May 27 14:59:07 2009 +0100 @@ -189,6 +189,33 @@ return current_state()->method(); } + // Temporary oop storage + public: + void set_oop_tmp(llvm::Value* value) + { + assert(value, "value must be non-NULL (will be reset by get_oop_tmp)"); + assert(!current_state()->oop_tmp(), "oop_tmp gets and sets must match"); + current_state()->set_oop_tmp(value); + } + llvm::Value* get_oop_tmp() + { + llvm::Value* value = current_state()->oop_tmp(); + assert(value, "oop_tmp gets and sets must match"); + current_state()->set_oop_tmp(NULL); + return value; + } + + // Monitors + private: + int num_monitors() + { + return current_state()->num_monitors(); + } + int set_num_monitors(int num_monitors) + { + current_state()->set_num_monitors(num_monitors); + } + // Code generation public: void emit_IR(); @@ -288,10 +315,13 @@ return call_vm_nocheck(callee, args, args + 4); } - // Whole-method synchronization + // Synchronization + private: + void acquire_lock(llvm::Value* lockee); + void release_lock(); + public: - void acquire_method_lock(); - void release_method_lock(); + void acquire_method_lock(); // Error checking private: @@ -311,7 +341,6 @@ private: void call_register_finalizer(llvm::Value* receiver); void handle_return(BasicType type, llvm::Value* exception); - void release_locked_monitors(); // arraylength private: From omajid at redhat.com Wed May 27 08:42:15 2009 From: omajid at redhat.com (Omair Majid) Date: Wed, 27 May 2009 11:42:15 -0400 Subject: RFC: Loading animation for applets Message-ID: <4A1D5F57.5040101@redhat.com> Hi, The attached patch adds an applet loading animation for IcedTeaPlugin to icedtea6. The patch adds binary files (images). A mercurial bundle is available from http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. (Use hg unbundle to apply it.) The main change is adding an animator class to NetxPanel. This PluginAppetLoadingAnimator shows the animation in the panel until the applet has initialized. To have the animator stop when the applet has finished initializing, extra events have been added. All these events are now sent by AppletPanel instead of NetxPanel since only AppletPanel knows exactly what the state of the applet it. ChangeLog 2009-05-27 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Apply applet patches. (stamps/patch.stamp): Copy applet images over into resources/. * patches/icedtea-applet-additional-events.patch: New file. Send additional applet events. Send them from here instead of NetxPanel. * patches/icedtea-applet-images.patch: New file. Fixes and creates Makefiles to install the images into resources.jar. * plugin/icedtea/sun/applet/PluginAppletLoadingAnimator.java: New file. This class is responsible for showing the applet loading animation. * plugin/icedtea/sun/applet/resources/icedtea-background-*.jpeg: Frames for the loading animation. * plugin/icedtea/sun/applet/resources/icedtea-text.png: New file. IcedTeaPlugin logo. * rt/net/sourceforge/jnlp/NetxPanel.java: Add animator. (NetxPanel): Initialize and add applet animator. (runLoader): Dont send applet events. AppletPanel takes care of that now. Any comments? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-applet-loading-animation.patch Type: text/x-patch Size: 34511 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090527/d7f1ee60/icedtea-applet-loading-animation.patch From ahughes at redhat.com Wed May 27 09:55:12 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 27 May 2009 16:55:12 +0000 Subject: changeset in /hg/icedtea: Fix Nimbus and Zero build issues and c... Message-ID: changeset ea63ce8e8819 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ea63ce8e8819 description: Fix Nimbus and Zero build issues and cleanup configure output. 2009-05-27 Andrew John Hughes * Makefile.am: Replace !ENABLE_OPTIMIZATIONS with DISABLE_OPTIMIZATIONS for clarity, only apply the Nimbus generation patch when ENABLE_NIMBUS is on but ENABLE_NIMBUS_GENERATION is off. * acinclude.m4: (DISABLE_OPTIMIZATIONS): Renamed from ENABLE_OPTIMIZATIONS for clarity, and added result message on all paths. (AC_CHECK_ENABLE_NIMBUS_GENERATION): Correct message to represent current default of no. (IT_CHECK_ADDITIONAL_VMS): Refactored to provide output on all paths and moved from configure.ac. * configure.ac: Replace additional-vms code with call to IT_CHECK_ADDITIONAL_VMS macro. * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Remove InlineSmallCode and... * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: ...add it here, only needed for Shark builds. diffstat: 6 files changed, 84 insertions(+), 52 deletions(-) ChangeLog | 21 +++++ Makefile.am | 8 +- acinclude.m4 | 64 ++++++++++++++---- configure.ac | 39 ---------- ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 1 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 3 diffs (247 lines): diff -r ecb875f82ef5 -r ea63ce8e8819 ChangeLog --- a/ChangeLog Tue May 26 23:54:58 2009 +0200 +++ b/ChangeLog Wed May 27 17:57:45 2009 +0100 @@ -1,3 +1,24 @@ 2009-05-26 Matthias Klose + + * Makefile.am: + Replace !ENABLE_OPTIMIZATIONS with DISABLE_OPTIMIZATIONS + for clarity, only apply the Nimbus generation patch when + ENABLE_NIMBUS is on but ENABLE_NIMBUS_GENERATION is off. + * acinclude.m4: + (DISABLE_OPTIMIZATIONS): Renamed from ENABLE_OPTIMIZATIONS + for clarity, and added result message on all paths. + (AC_CHECK_ENABLE_NIMBUS_GENERATION): Correct message to + represent current default of no. + (IT_CHECK_ADDITIONAL_VMS): Refactored to provide output on + all paths and moved from configure.ac. + * configure.ac: + Replace additional-vms code with call to IT_CHECK_ADDITIONAL_VMS + macro. + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: + Remove InlineSmallCode and... + * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: + ...add it here, only needed for Shark builds. + 2009-05-26 Matthias Klose * patches/cacao/launcher.patch: Update for OpenJDK 7. diff -r ecb875f82ef5 -r ea63ce8e8819 Makefile.am --- a/Makefile.am Tue May 26 23:54:58 2009 +0200 +++ b/Makefile.am Wed May 27 17:57:45 2009 +0100 @@ -59,7 +59,7 @@ PULSE_JAVA_CLASS_DIR = PULSE_JAVA_CLASS_DIR = endif -if ENABLE_NIMBUS +if ENABLE_NIMBUS_GENERATION JIBX_DEPS_DIR=$(abs_top_builddir)/jibx endif @@ -1568,7 +1568,7 @@ ICEDTEA_ENV += \ "DISABLE_NIMBUS=true" endif -if !ENABLE_OPTIMIZATIONS +if DISABLE_OPTIMIZATIONS ICEDTEA_ENV += \ "NO_OPTIMIZATIONS=true" \ "CC_NO_OPT=-O0 -g" @@ -1646,7 +1646,7 @@ ICEDTEA_ENV_ECJ += \ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)" endif -if !ENABLE_OPTIMIZATIONS +if DISABLE_OPTIMIZATIONS ICEDTEA_ENV_ECJ += \ "NO_OPTIMIZATIONS=true" \ "CC_NO_OPT=-O0 -g" @@ -2098,8 +2098,10 @@ ICEDTEA_PATCHES += patches/icedtea-syste ICEDTEA_PATCHES += patches/icedtea-systemtap.patch endif +if ENABLE_NIMBUS if !ENABLE_NIMBUS_GENERATION ICEDTEA_PATCHES += patches/icedtea-pregenerated-nimbus.patch +endif endif stamps/extract.stamp: stamps/download.stamp diff -r ecb875f82ef5 -r ea63ce8e8819 acinclude.m4 --- a/acinclude.m4 Tue May 26 23:54:58 2009 +0200 +++ b/acinclude.m4 Wed May 27 17:57:45 2009 +0100 @@ -665,27 +665,26 @@ AC_DEFUN([FIND_PULSEAUDIO], AC_SUBST(PULSEAUDIO_BIN) ]) -AC_DEFUN([ENABLE_OPTIMIZATIONS], -[ - AC_MSG_CHECKING(whether to disable optimizations) +AC_DEFUN([DISABLE_OPTIMIZATIONS], +[ + AC_MSG_CHECKING([whether to disable optimizations and build with -O0 -g]) AC_ARG_ENABLE([optimizations], [AS_HELP_STRING(--disable-optimizations,build with -O0 -g [[default=no]])], [ case "${enableval}" in no) - AC_MSG_RESULT([yes, building with -O0 -g]) - enable_optimizations=no + disable_optimizations=yes ;; *) - AC_MSG_RESULT([no]) - enable_optimizations=yes + disable_optimizations=no ;; esac ], [ - enable_optimizations=yes - ]) - AM_CONDITIONAL([ENABLE_OPTIMIZATIONS], test x"${enable_optimizations}" = "xyes") + disable_optimizations=no + ]) + AC_MSG_RESULT([$disable_optimizations]) + AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], test x"${disable_optimizations}" = "xyes") ]) AC_DEFUN([FIND_TOOL], @@ -1506,7 +1505,7 @@ AC_DEFUN([AC_CHECK_ENABLE_NIMBUS_GENERAT [ AC_MSG_CHECKING(whether to generate the Nimbus source files using JIBX) AC_ARG_ENABLE([nimbus-generation], - [AS_HELP_STRING(--enable-nimbus-generation,generate the Nimbus source with JIBX [[default=yes]])], + [AS_HELP_STRING(--enable-nimbus-generation,generate the Nimbus source with JIBX [[default=no]])], [ ENABLE_NIMBUS_GENERATION="${enableval}" ], @@ -1518,3 +1517,46 @@ AC_DEFUN([AC_CHECK_ENABLE_NIMBUS_GENERAT AM_CONDITIONAL(ENABLE_NIMBUS_GENERATION, test x"${ENABLE_NIMBUS_GENERATION}" = "xyes") AC_SUBST(ENABLE_NIMBUS_GENERATION) ]) + +AC_DEFUN([IT_CHECK_ADDITIONAL_VMS], +[ +AC_MSG_CHECKING([for additional virtual machines to build]) +AC_ARG_WITH(additional-vms, + AC_HELP_STRING([--with-additional-vms=vm-list], + [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]), +[ +if test "x${withval}" != x ; then + with_additional_vms=${withval} + for vm in `echo ${with_additional_vms} | sed 's/,/ /g'`; do + case "x$vm" in + xcacao) add_vm_cacao=yes;; + xzero) add_vm_zero=yes;; + xshark) add_vm_shark=yes;; + *) AC_MSG_ERROR([proper usage is --with-additional-vms=vm1,vm2,...]) + esac + done +fi]) + +if test "x${with_additional_vms}" = x; then + with_additional_vms="none"; +fi +AC_MSG_RESULT($with_additional_vms) + +AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x) +AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x) +AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x) +AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes) + +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 + AC_MSG_ERROR([additional vm is the default vm]) +fi +if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then + AC_MSG_ERROR([cannot build with system cacao as additional vm]) +fi +if test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${abs_top_builddir}" = "x${abs_top_srcdir}"; then + AC_MSG_ERROR([build of additional zero/shark VM requires build with srcdir != builddir]) +fi +]) diff -r ecb875f82ef5 -r ea63ce8e8819 configure.ac --- a/configure.ac Tue May 26 23:54:58 2009 +0200 +++ b/configure.ac Wed May 27 17:57:45 2009 +0100 @@ -313,12 +313,13 @@ AC_CHECK_WITH_CACAO_SRC_ZIP AC_CHECK_WITH_CACAO_SRC_ZIP AC_CHECK_ENABLE_NIMBUS AC_CHECK_ENABLE_NIMBUS_GENERATION -ENABLE_OPTIMIZATIONS +DISABLE_OPTIMIZATIONS SET_SHARK_BUILD ENABLE_ZERO_BUILD WITH_VERSION_SUFFIX WITH_PROJECT ENABLE_HG +IT_CHECK_ADDITIONAL_VMS AC_PATH_TOOL([HG],[hg]) if test "x${enable_hg}" = "xyes"; then @@ -538,42 +539,6 @@ then AC_SUBST(GTK_LIBS) fi - -AC_MSG_CHECKING(for --with-additional-vms) -AC_ARG_WITH(additional-vms, - AC_HELP_STRING([--with-additional-vms=vm-list], [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]), -[ -if test x$with_additional_vms != x -then - for vm in `echo $with_additional_vms | sed 's/,/ /g'`; do - case "x$vm" in - xcacao) add_vm_cacao=yes;; - xzero) add_vm_zero=yes;; - xshark) add_vm_shark=yes;; - *) AC_MSG_ERROR([proper usage is --with-additional-vms=vm1,vm2,...]) - esac - done -fi]) -AC_MSG_RESULT($with_additional_vms) - -AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x) -AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x) -AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x) -AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes) - -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 - AC_MSG_ERROR([additional vm is the default vm]) -fi -if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then - AC_MSG_ERROR([cannot build with system cacao as additional vm]) -fi -if test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${abs_top_builddir}" = "x${abs_top_srcdir}"; then - AC_MSG_ERROR([build of additional zero/shark VM requires build with srcdir != builddir]) -fi - if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then dnl Check for libffi headers and libraries. PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no]) diff -r ecb875f82ef5 -r ea63ce8e8819 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Tue May 26 23:54:58 2009 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Wed May 27 17:57:45 2009 +0100 @@ -44,7 +44,6 @@ define_pd_global(uintx, NewSize, define_pd_global(uintx, NewSize, ScaleForWordSize(1024 * K)); #endif // _LP64 define_pd_global(intx, InlineFrequencyCount, 100); -define_pd_global(intx, InlineSmallCode, 1000); define_pd_global(intx, PreInflateSpin, 10); define_pd_global(intx, StackYellowPages, 2); diff -r ecb875f82ef5 -r ea63ce8e8819 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Tue May 26 23:54:58 2009 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Wed May 27 17:57:45 2009 +0100 @@ -61,3 +61,6 @@ define_pd_global(bool, NeverActAsServer define_pd_global(bool, NeverActAsServerClassMachine, true ); define_pd_global(uintx, DefaultMaxRAM, 1*G ); define_pd_global(bool, CICompileOSR, true ); + +/* Required for Shark on OpenJDK7 */ +define_pd_global(intx, InlineSmallCode, 1000); From bugzilla-daemon at icedtea.classpath.org Wed May 27 10:23:35 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 17:23:35 +0000 Subject: [Bug 337] icedtea7 20090527 fails to build zero Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=337 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #2 from gnu_andrew at member.fsf.org 2009-05-27 17:23 ------- http://icedtea.classpath.org/hg/icedtea/rev/ea63ce8e8819 Fixed. Defined in shark_zero_globals.hpp instead. -- 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 dbhole at redhat.com Wed May 27 10:59:48 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 27 May 2009 13:59:48 -0400 Subject: RFC: Netx - Check and store intial-heap-size and max-heap-size In-Reply-To: <4A1C2C7E.5090006@redhat.com> References: <4A1C2C7E.5090006@redhat.com> Message-ID: <20090527175948.GC17948@redhat.com> * Omair Majid [2009-05-26 13:53]: > Hi, > > JNLP files can specify the initial heap size and the max heap size for > the JVM. NetX currently ignores these. The attached patch makes Netx > check that the values supplied in the JNLP file are correct, and store > them as strings to preserve the original values. > > ChangeLog: > 2009-05-26 Omair Majid > * rt/net/sourceforge/jnlp/JREDesc.java: Change type of > initialHeapSize to String. Change type of maximumHeapSize to String. > (JREDesc): Check for sensible values for heap sizes. > (getMaximumHeapSize): Change return type to String. > (getInitialHeapSize): Likewise. > (heapToLong): Renamed to checkHeapSize. > (checkHeapSize): Check for valid heap size. > * rt/net/sourceforge/jnlp/resources/Messages.properties: Add > PBadHeapSize message to indicate an invalid heap size. > > Any comments? Looks good. Have you given any thought to how these values will be used by the way? The current design does not allow setting of heap sizes as the application code runs from the same vm instance as 'javaws' itself. You could make it launch a new vm process I guess, but that'd be a bit messy, specially since the security manager and stuff would need to be reset somehow, which means the need for another wrapper.. Anyways, patch is good. Go ahead and commit any time. Deepak > > Cheers, > Omair > From langel at redhat.com Wed May 27 11:00:51 2009 From: langel at redhat.com (Lillian Angel) Date: Wed, 27 May 2009 14:00:51 -0400 Subject: RFC: Loading animation for applets In-Reply-To: <4A1D5F57.5040101@redhat.com> References: <4A1D5F57.5040101@redhat.com> Message-ID: <4A1D7FD3.1000700@redhat.com> Omair Majid wrote: > Hi, > > The attached patch adds an applet loading animation for IcedTeaPlugin > to icedtea6. > > The patch adds binary files (images). A mercurial bundle is available > from http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. > (Use hg unbundle to apply it.) > > The main change is adding an animator class to NetxPanel. This > PluginAppetLoadingAnimator shows the animation in the panel until the > applet has initialized. To have the animator stop when the applet has > finished initializing, extra events have been added. All these events > are now sent by AppletPanel instead of NetxPanel since only > AppletPanel knows exactly what the state of the applet it. > > ChangeLog > 2009-05-27 Omair Majid > > * Makefile.am > (ICEDTEA_PATCHES): Apply applet patches. > (stamps/patch.stamp): Copy applet images over into resources/. > * patches/icedtea-applet-additional-events.patch: New file. Send > additional applet events. Send them from here instead of NetxPanel. > * patches/icedtea-applet-images.patch: New file. Fixes and creates > Makefiles to install the images into resources.jar. Remember to update HACKING if you are creating new patches. Also, make note of them here: http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches Cheers, Lillian > * plugin/icedtea/sun/applet/PluginAppletLoadingAnimator.java: New > file. This class is responsible for showing the applet loading > animation. > * plugin/icedtea/sun/applet/resources/icedtea-background-*.jpeg: > Frames for the loading animation. > * plugin/icedtea/sun/applet/resources/icedtea-text.png: New file. > IcedTeaPlugin logo. > * rt/net/sourceforge/jnlp/NetxPanel.java: Add animator. > (NetxPanel): Initialize and add applet animator. > (runLoader): Dont send applet events. AppletPanel takes care of that > now. > > Any comments? > > Cheers, > Omair From bugzilla-daemon at icedtea.classpath.org Wed May 27 11:00:28 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 18:00:28 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 ------- Comment #6 from gnu_andrew at member.fsf.org 2009-05-27 18:00 ------- Still at a loss as to why this fails for you. I've done a gcj build of every changeset I've done. My options are: $ /home/andrew/projects/openjdk/icedtea/configure --with-parallel-jobs=9 --with-gcj-home=/usr/lib/jvm/gcj-jdk --with-openjdk-src-dir=/home/andrew/projects/openjdk/openjdk.icedtea/jdk7 --with-java=/usr/lib/jvm/gcj-jdk/bin/java --with-javah=/home/andrew/build/classpath/bin/gjavah --with-jar=/usr/lib/jvm/gcj-jdk/bin/jar --with-rmic=/usr/lib/jvm/gcj-jdk/bin/rmic --disable-docs --enable-pulse-java --with-icedtea-home=/home/andrew/build/icedtea6 --with-abs-install-dir=/home/andrew/build --enable-nimbus-generation The only difference I can see in yours is that you explicitly set some values to their defaults and you enable CACAO. Neither should cause this. com.sun.mirror.* should be in your hotspot-tools build. So something is going wrong earlier in the build or the JAR with these classes is not being used by ant. -- 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 omajid at redhat.com Wed May 27 11:16:59 2009 From: omajid at redhat.com (Omair Majid) Date: Wed, 27 May 2009 14:16:59 -0400 Subject: RFC: Netx - Check and store intial-heap-size and max-heap-size In-Reply-To: <20090527175948.GC17948@redhat.com> References: <4A1C2C7E.5090006@redhat.com> <20090527175948.GC17948@redhat.com> Message-ID: <4A1D839B.9010607@redhat.com> Deepak Bhole wrote: > * Omair Majid [2009-05-26 13:53]: >> Any comments? > > Looks good. > > Have you given any thought to how these values will be used by the way? The > current design does not allow setting of heap sizes as the application > code runs from the same vm instance as 'javaws' itself. You could make > it launch a new vm process I guess, but that'd be a bit messy, specially > since the security manager and stuff would need to be reset somehow, > which means the need for another wrapper.. > I am thinking of an ugly hack here: add an option -Xnofork for net.sourceforge.jnlp.runtime.Boot. The first jvm reads everything and figures out that it needs to create another jvm. It then launches the second jvm with the relevant options and passes -Xnofork to net.sourceforge.jnlp.runtime.Boot (I am extending Launcher.launchExternal() to accept args to pass to the new jvm and the new java program) with the same jnlp file. This second jvm sees the -Xnofork option and ignores everything that requires a new jvm. Does that make any sense? That shouldn't affect security, should it? > Anyways, patch is good. Go ahead and commit any time. > Thanks for the review! Cheers, Omair From omajid at redhat.com Wed May 27 11:23:45 2009 From: omajid at redhat.com (Omair Majid) Date: Wed, 27 May 2009 14:23:45 -0400 Subject: RFC: Loading animation for applets In-Reply-To: <4A1D7FD3.1000700@redhat.com> References: <4A1D5F57.5040101@redhat.com> <4A1D7FD3.1000700@redhat.com> Message-ID: <4A1D8531.8000709@redhat.com> Lillian Angel wrote: > Omair Majid wrote: >> Hi, >> >> The attached patch adds an applet loading animation for IcedTeaPlugin >> to icedtea6. >> >> The patch adds binary files (images). A mercurial bundle is available >> from http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. >> (Use hg unbundle to apply it.) >> >> The main change is adding an animator class to NetxPanel. This >> PluginAppetLoadingAnimator shows the animation in the panel until the >> applet has initialized. To have the animator stop when the applet has >> finished initializing, extra events have been added. All these events >> are now sent by AppletPanel instead of NetxPanel since only >> AppletPanel knows exactly what the state of the applet it. >> >> ChangeLog >> 2009-05-27 Omair Majid >> >> * Makefile.am >> (ICEDTEA_PATCHES): Apply applet patches. >> (stamps/patch.stamp): Copy applet images over into resources/. >> * patches/icedtea-applet-additional-events.patch: New file. Send >> additional applet events. Send them from here instead of NetxPanel. >> * patches/icedtea-applet-images.patch: New file. Fixes and creates >> Makefiles to install the images into resources.jar. > > Remember to update HACKING if you are creating new patches. Also, make > note of them here: http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches > Whoops :( I knew I was forgetting something. I will fix this before I commit. Any other issues? Omair From ahughes at redhat.com Wed May 27 11:33:11 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 27 May 2009 18:33:11 +0000 Subject: changeset in /hg/icedtea: Fix building with --enable-hg by addin... Message-ID: changeset 31e361735a0c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=31e361735a0c description: Fix building with --enable-hg by adding support for the IcedTea project. 2009-05-27 Andrew John Hughes * Makefile.am: Add support for IcedTea project and make this the default. Update download URLs to be relative to the IcedTea project URL. Always include javax.script in copy dirs (conditional is an artefact of IcedTea6 merge). * acinclude.m4: (WITH_PROJECT): Add support for IcedTea and make it the default. diffstat: 3 files changed, 40 insertions(+), 26 deletions(-) ChangeLog | 11 +++++++++++ Makefile.am | 42 ++++++++++++++++++++++-------------------- acinclude.m4 | 13 +++++++------ diffs (157 lines): diff -r ea63ce8e8819 -r 31e361735a0c ChangeLog --- a/ChangeLog Wed May 27 17:57:45 2009 +0100 +++ b/ChangeLog Wed May 27 19:35:49 2009 +0100 @@ -1,3 +1,14 @@ 2009-05-27 Andrew John Hughes + + * Makefile.am: + Add support for IcedTea project and make this + the default. Update download URLs to be relative + to the IcedTea project URL. Always include javax.script + in copy dirs (conditional is an artefact of IcedTea6 merge). + * acinclude.m4: + (WITH_PROJECT): Add support for IcedTea and make it the + default. + 2009-05-27 Andrew John Hughes * Makefile.am: diff -r ea63ce8e8819 -r 31e361735a0c Makefile.am --- a/Makefile.am Wed May 27 17:57:45 2009 +0100 +++ b/Makefile.am Wed May 27 19:35:49 2009 +0100 @@ -1677,6 +1677,7 @@ dist-openjdk: stamps/extract-cacao.stamp 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/ @@ -1684,13 +1685,13 @@ BSD_HG_URL = http://hg.openjdk.java.net/ BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/ -OPENJDK_URL = http://hg.openjdk.java.net/icedtea/jdk7 -CORBA_URL = http://hg.openjdk.java.net/icedtea/jdk7/corba -JAXP_URL = http://hg.openjdk.java.net/icedtea/jdk7/jaxp -JAXWS_URL = http://hg.openjdk.java.net/icedtea/jdk7/jaxws -JDK_URL = http://hg.openjdk.java.net/icedtea/jdk7/jdk -LANGTOOLS_URL = http://hg.openjdk.java.net/icedtea/jdk7/langtools -HOTSPOT_URL = http://hg.openjdk.java.net/icedtea/jdk7/hotspot +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 if USE_ALT_OPENJDK_SRC_ZIP OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) @@ -1776,11 +1777,22 @@ if USE_NIO2 if USE_NIO2 hg fclone $(NIO2_HG_URL) openjdk; else +if USE_JDK7 + hg fclone $(OPENJDK_HG_URL) openjdk; +else if USE_HG if WITH_HGREV - $(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk; + $(HG) fclone -r $(HGREV) $(ICEDTEA_HG_URL) openjdk; else - $(HG) fclone $(OPENJDK_HG_URL) openjdk; + $(HG) fclone $(ICEDTEA_HG_URL) openjdk; +endif +endif +endif +endif +endif +endif +endif +endif endif else if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ @@ -1837,13 +1849,6 @@ else fi ; \ $(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \ fi ; -endif -endif -endif -endif -endif -endif -endif if ! echo "$(HS_MD5SUM) $(HOTSPOT_SRC_ZIP)" \ | $(MD5SUM) --check ; \ then \ @@ -2929,10 +2934,7 @@ ICEDTEA_COPY_DIRS = \ java/util \ java/rmi \ sun/awt/ \ - javax/net/ssl - -if WITH_ALT_HSBUILD -ICEDTEA_COPY_DIRS += \ + javax/net/ssl \ javax/script endif diff -r ea63ce8e8819 -r 31e361735a0c acinclude.m4 --- a/acinclude.m4 Wed May 27 17:57:45 2009 +0100 +++ b/acinclude.m4 Wed May 27 19:35:49 2009 +0100 @@ -889,7 +889,7 @@ AC_DEFUN([ENABLE_HG], [ AC_MSG_CHECKING(whether to retrieve the source code from Mercurial) AC_ARG_ENABLE([hg], - [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=no]])], + [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=depends on project]])], [ case "${enableval}" in no) @@ -902,7 +902,7 @@ AC_DEFUN([ENABLE_HG], ], [ case "${project}" in - jdk7) + icedtea) enable_hg=no ;; *) @@ -946,14 +946,14 @@ AC_DEFUN([WITH_PROJECT], [ AC_MSG_CHECKING(which OpenJDK project is being used) AC_ARG_WITH([project], - [AS_HELP_STRING(--with-project,choose the OpenJDK project to use: jdk7 closures cvmi caciocavallo bsd nio2 [[default=jdk7]])], + [AS_HELP_STRING(--with-project,choose the OpenJDK project to use: icedtea jdk7 closures cvmi caciocavallo bsd nio2 [[default=icedtea]])], [ case "${withval}" in yes) - project=jdk7 + project=icedtea ;; no) - project=jdk7 + AC_MSG_ERROR([argument passed to --with-project should be a supported OpenJDK project (see help)]) ;; *) project=${withval} @@ -961,7 +961,7 @@ AC_DEFUN([WITH_PROJECT], esac ], [ - project=jdk7 + project=icedtea ]) AC_MSG_RESULT([${project}]) AC_SUBST(PROJECT_NAME, $project) @@ -970,6 +970,7 @@ AC_DEFUN([WITH_PROJECT], AM_CONDITIONAL([USE_CACIOCAVALLO], test x"${project}" = "xcaciocavallo") AM_CONDITIONAL([USE_BSD], test x"${project}" = "xbsd") AM_CONDITIONAL([USE_NIO2], test x"${project}" = "xnio2") + AM_CONDITIONAL([USE_JDK7], test x"${project}" = "xjdk7") ]) AC_DEFUN([AC_CHECK_WITH_GCJ], From dbhole at redhat.com Wed May 27 11:50:03 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 27 May 2009 14:50:03 -0400 Subject: RFC: Netx - Check and store intial-heap-size and max-heap-size In-Reply-To: <4A1D839B.9010607@redhat.com> References: <4A1C2C7E.5090006@redhat.com> <20090527175948.GC17948@redhat.com> <4A1D839B.9010607@redhat.com> Message-ID: <20090527185003.GD17948@redhat.com> * Omair Majid [2009-05-27 14:17]: > Deepak Bhole wrote: >> * Omair Majid [2009-05-26 13:53]: >>> Any comments? >> >> Looks good. >> >> Have you given any thought to how these values will be used by the way? >> The current design does not allow setting of heap sizes as the >> application code runs from the same vm instance as 'javaws' itself. You >> could make >> it launch a new vm process I guess, but that'd be a bit messy, specially >> since the security manager and stuff would need to be reset somehow, >> which means the need for another wrapper.. >> > > I am thinking of an ugly hack here: add an option -Xnofork for > net.sourceforge.jnlp.runtime.Boot. The first jvm reads everything and > figures out that it needs to create another jvm. It then launches the > second jvm with the relevant options and passes -Xnofork to > net.sourceforge.jnlp.runtime.Boot (I am extending > Launcher.launchExternal() to accept args to pass to the new jvm and the > new java program) with the same jnlp file. This second jvm sees the > -Xnofork option and ignores everything that requires a new jvm. Does > that make any sense? That shouldn't affect security, should it? > Yeah, I really wanted to avoid the recursive call scenario. It seems like the only option at the moment though. Okay then. I just wanted to know if there was another possible workaround. Cheers, Deepak >> Anyways, patch is good. Go ahead and commit any time. >> > Thanks for the review! > > Cheers, > Omair From ahughes at redhat.com Wed May 27 11:58:34 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 27 May 2009 18:58:34 +0000 Subject: changeset in /hg/icedtea: Fix placement of endifs. Message-ID: changeset caf6ea78c242 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=caf6ea78c242 description: Fix placement of endifs. 2009-05-27 Andrew John Hughes * Makefile.am: Fix endif placement. diffstat: 2 files changed, 13 insertions(+), 9 deletions(-) ChangeLog | 5 +++++ Makefile.am | 17 ++++++++--------- diffs (53 lines): diff -r 31e361735a0c -r caf6ea78c242 ChangeLog --- a/ChangeLog Wed May 27 19:35:49 2009 +0100 +++ b/ChangeLog Wed May 27 20:01:08 2009 +0100 @@ -1,3 +1,8 @@ 2009-05-27 Andrew John Hughes + + * Makefile.am: + Fix endif placement. + 2009-05-27 Andrew John Hughes * Makefile.am: diff -r 31e361735a0c -r caf6ea78c242 Makefile.am --- a/Makefile.am Wed May 27 19:35:49 2009 +0100 +++ b/Makefile.am Wed May 27 20:01:08 2009 +0100 @@ -1786,14 +1786,6 @@ else else $(HG) fclone $(ICEDTEA_HG_URL) openjdk; endif -endif -endif -endif -endif -endif -endif -endif -endif else if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ | $(MD5SUM) --check ; \ @@ -1858,6 +1850,14 @@ else fi ; \ $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \ fi +endif +endif +endif +endif +endif +endif +endif +endif endif if BUILD_CACAO if !USE_SYSTEM_CACAO @@ -2936,7 +2936,6 @@ ICEDTEA_COPY_DIRS = \ sun/awt/ \ javax/net/ssl \ javax/script -endif stamps/copy-source-files.stamp: stamps/overlay.stamp for copy_dir in $(ICEDTEA_COPY_DIRS) ; \ From dbhole at redhat.com Wed May 27 12:19:04 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 27 May 2009 15:19:04 -0400 Subject: RFC: Loading animation for applets In-Reply-To: <4A1D5F57.5040101@redhat.com> References: <4A1D5F57.5040101@redhat.com> Message-ID: <20090527191904.GE17948@redhat.com> * Omair Majid [2009-05-27 13:31]: > Hi, > > The attached patch adds an applet loading animation for IcedTeaPlugin to > icedtea6. > > The patch adds binary files (images). A mercurial bundle is available > from http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. > (Use hg unbundle to apply it.) > > The main change is adding an animator class to NetxPanel. This > PluginAppetLoadingAnimator shows the animation in the panel until the > applet has initialized. To have the animator stop when the applet has > finished initializing, extra events have been added. All these events > are now sent by AppletPanel instead of NetxPanel since only AppletPanel > knows exactly what the state of the applet it. > I see you are patching AppletPanel. Can't this be done instead by drawing the image in a panel added to the main applet panel via PluginAppletViewer? Changing upstream classes for the plugin should be avoided unless absolutely necessary... Deepak > ChangeLog > 2009-05-27 Omair Majid > > * Makefile.am > (ICEDTEA_PATCHES): Apply applet patches. > (stamps/patch.stamp): Copy applet images over into resources/. > * patches/icedtea-applet-additional-events.patch: New file. Send > additional applet events. Send them from here instead of NetxPanel. > * patches/icedtea-applet-images.patch: New file. Fixes and creates > Makefiles to install the images into resources.jar. > * plugin/icedtea/sun/applet/PluginAppletLoadingAnimator.java: New > file. This class is responsible for showing the applet loading > animation. > * plugin/icedtea/sun/applet/resources/icedtea-background-*.jpeg: > Frames for the loading animation. > * plugin/icedtea/sun/applet/resources/icedtea-text.png: New file. > IcedTeaPlugin logo. > * rt/net/sourceforge/jnlp/NetxPanel.java: Add animator. > (NetxPanel): Initialize and add applet animator. > (runLoader): Dont send applet events. AppletPanel takes care of that > now. > > Any comments? > > Cheers, > Omair From omajid at redhat.com Wed May 27 12:36:15 2009 From: omajid at redhat.com (Omair Majid) Date: Wed, 27 May 2009 15:36:15 -0400 Subject: RFC: Loading animation for applets In-Reply-To: <20090527191904.GE17948@redhat.com> References: <4A1D5F57.5040101@redhat.com> <20090527191904.GE17948@redhat.com> Message-ID: <4A1D962F.8040109@redhat.com> Deepak Bhole wrote: > * Omair Majid [2009-05-27 13:31]: >> Hi, >> >> The attached patch adds an applet loading animation for IcedTeaPlugin to >> icedtea6. >> >> The patch adds binary files (images). A mercurial bundle is available >> from http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. >> (Use hg unbundle to apply it.) >> >> The main change is adding an animator class to NetxPanel. This >> PluginAppetLoadingAnimator shows the animation in the panel until the >> applet has initialized. To have the animator stop when the applet has >> finished initializing, extra events have been added. All these events >> are now sent by AppletPanel instead of NetxPanel since only AppletPanel >> knows exactly what the state of the applet it. >> > > I see you are patching AppletPanel. Can't this be done instead by > drawing the image in a panel added to the main applet panel via > PluginAppletViewer? Changing upstream classes for the plugin should be > avoided unless absolutely necessary... > The hook for the image drawing code is through NetxPanel which is not part of upstream. The patch to AppletPanel makes the applet emit more events to any AppletListener listening. This allows us to find out when Applet.init() completes and stop the animation, which matches the behaviour of Sun's plugin. Without this patch, the animation would only display until init() is called. I agree about patching upstream classes, but I couldn't see any other way to find out when init() has completed (short of adding more code and a specialized listener class to AppletPanel). If you still think this is a bad idea, let me know, and I will remove it. Cheers, Omair From dbhole at redhat.com Wed May 27 12:54:59 2009 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 27 May 2009 15:54:59 -0400 Subject: RFC: Loading animation for applets In-Reply-To: <4A1D962F.8040109@redhat.com> References: <4A1D5F57.5040101@redhat.com> <20090527191904.GE17948@redhat.com> <4A1D962F.8040109@redhat.com> Message-ID: <20090527195459.GF17948@redhat.com> * Omair Majid [2009-05-27 15:36]: > Deepak Bhole wrote: >> * Omair Majid [2009-05-27 13:31]: >>> Hi, >>> >>> The attached patch adds an applet loading animation for IcedTeaPlugin >>> to icedtea6. >>> >>> The patch adds binary files (images). A mercurial bundle is available >>> from >>> http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. >>> (Use hg unbundle to apply it.) >>> >>> The main change is adding an animator class to NetxPanel. This >>> PluginAppetLoadingAnimator shows the animation in the panel until the >>> applet has initialized. To have the animator stop when the applet >>> has finished initializing, extra events have been added. All these >>> events are now sent by AppletPanel instead of NetxPanel since only >>> AppletPanel knows exactly what the state of the applet it. >>> >> >> I see you are patching AppletPanel. Can't this be done instead by >> drawing the image in a panel added to the main applet panel via >> PluginAppletViewer? Changing upstream classes for the plugin should be >> avoided unless absolutely necessary... >> > > The hook for the image drawing code is through NetxPanel which is not > part of upstream. The patch to AppletPanel makes the applet emit more > events to any AppletListener listening. This allows us to find out when > Applet.init() completes and stop the animation, which matches the > behaviour of Sun's plugin. Without this patch, the animation would only > display until init() is called. > > I agree about patching upstream classes, but I couldn't see any other > way to find out when init() has completed (short of adding more code and > a specialized listener class to AppletPanel). If you still think this is > a bad idea, let me know, and I will remove it. > That is the only time we should be drawing for, should we not? I thought the Sun plugin drew only while the jars were downloading, and then delegated to the applet? If the applet has a splash screen that it displays in its init(), wouldn't this patch override it with our splash? Deepak > Cheers, > Omair From bugzilla-daemon at icedtea.classpath.org Wed May 27 12:52:49 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 19:52:49 +0000 Subject: [Bug 340] files with "ibm confidential" header files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=340 ------- Comment #2 from gnu_andrew at member.fsf.org 2009-05-27 19:52 ------- It'd be good if you could explain exactly what the issue is, and file an associated bug upstream at bugs.openjdk.java.net. Thanks. -- 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 Wed May 27 12:54:21 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 19:54:21 +0000 Subject: [Bug 341] questionable license headers in J2DBench Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=341 ------- Comment #1 from gnu_andrew at member.fsf.org 2009-05-27 19:54 ------- It'd be good if you could explain exactly what the issue is, and file an associated bug upstream at bugs.openjdk.java.net. Although it's useful having a 'hit list' here for us, the real problem is upstream; we fixed it in IcedTea. Thanks. -- 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 Wed May 27 12:55:41 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 May 2009 19:55:41 +0000 Subject: [Bug 342] copyright unclear for binary *.spp files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=342 ------- Comment #1 from gnu_andrew at member.fsf.org 2009-05-27 19:55 ------- Have you checked whether they are generated in IcedTea (after we delete them)? There is a tool called Spp.java so I guess this generates them. -- 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 May 27 13:08:23 2009 From: mark at klomp.org (Mark Wielaard) Date: Wed, 27 May 2009 22:08:23 +0200 Subject: RFC: Loading animation for applets In-Reply-To: <4A1D5F57.5040101@redhat.com> References: <4A1D5F57.5040101@redhat.com> Message-ID: <1243454903.3818.30.camel@hermans.wildebeest.org> On Wed, 2009-05-27 at 11:42 -0400, Omair Majid wrote: > The attached patch adds an applet loading animation for IcedTeaPlugin to > icedtea6. > > The patch adds binary files (images). A mercurial bundle is available > from http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. > (Use hg unbundle to apply it.) > > The main change is adding an animator class to NetxPanel. This > PluginAppetLoadingAnimator shows the animation in the panel until the > applet has initialized. > [...] > * plugin/icedtea/sun/applet/resources/icedtea-background-*.jpeg: > Frames for the loading animation. Very cute, but 60 frames, 55K each, adding 3MB... Could that be reduced a bit please. Thanks, Mark From omajid at redhat.com Wed May 27 13:38:59 2009 From: omajid at redhat.com (Omair Majid) Date: Wed, 27 May 2009 16:38:59 -0400 Subject: RFC: Loading animation for applets In-Reply-To: <20090527195459.GF17948@redhat.com> References: <4A1D5F57.5040101@redhat.com> <20090527191904.GE17948@redhat.com> <4A1D962F.8040109@redhat.com> <20090527195459.GF17948@redhat.com> Message-ID: <4A1DA4E3.2020406@redhat.com> Deepak Bhole wrote: > * Omair Majid [2009-05-27 15:36]: >> Deepak Bhole wrote: >>> * Omair Majid [2009-05-27 13:31]: >>>> Hi, >>>> >>>> The attached patch adds an applet loading animation for IcedTeaPlugin >>>> to icedtea6. >>>> >>>> The patch adds binary files (images). A mercurial bundle is available >>>> from >>>> http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. >>>> (Use hg unbundle to apply it.) >>>> >>>> The main change is adding an animator class to NetxPanel. This >>>> PluginAppetLoadingAnimator shows the animation in the panel until the >>>> applet has initialized. To have the animator stop when the applet >>>> has finished initializing, extra events have been added. All these >>>> events are now sent by AppletPanel instead of NetxPanel since only >>>> AppletPanel knows exactly what the state of the applet it. >>>> >>> I see you are patching AppletPanel. Can't this be done instead by >>> drawing the image in a panel added to the main applet panel via >>> PluginAppletViewer? Changing upstream classes for the plugin should be >>> avoided unless absolutely necessary... >>> >> The hook for the image drawing code is through NetxPanel which is not >> part of upstream. The patch to AppletPanel makes the applet emit more >> events to any AppletListener listening. This allows us to find out when >> Applet.init() completes and stop the animation, which matches the >> behaviour of Sun's plugin. Without this patch, the animation would only >> display until init() is called. >> >> I agree about patching upstream classes, but I couldn't see any other >> way to find out when init() has completed (short of adding more code and >> a specialized listener class to AppletPanel). If you still think this is >> a bad idea, let me know, and I will remove it. >> > > That is the only time we should be drawing for, should we not? I thought > the Sun plugin drew only while the jars were downloading, and then > delegated to the applet? If the applet has a splash screen that it > displays in its init(), wouldn't this patch override it with our splash? > Sun's plugin draws while init() is running, just like this patch. I will try to fix this so the applet has full control after init() starts. Cheers, Omair From omajid at redhat.com Wed May 27 13:46:20 2009 From: omajid at redhat.com (Omair Majid) Date: Wed, 27 May 2009 16:46:20 -0400 Subject: RFC: Loading animation for applets In-Reply-To: <1243454903.3818.30.camel@hermans.wildebeest.org> References: <4A1D5F57.5040101@redhat.com> <1243454903.3818.30.camel@hermans.wildebeest.org> Message-ID: <4A1DA69C.60000@redhat.com> Mark Wielaard wrote: > On Wed, 2009-05-27 at 11:42 -0400, Omair Majid wrote: >> The attached patch adds an applet loading animation for IcedTeaPlugin to >> icedtea6. >> >> The patch adds binary files (images). A mercurial bundle is available >> from http://icedtea.classpath.org/~omajid/applet-loading-animation.hg. >> (Use hg unbundle to apply it.) >> >> The main change is adding an animator class to NetxPanel. This >> PluginAppetLoadingAnimator shows the animation in the panel until the >> applet has initialized. >> [...] >> * plugin/icedtea/sun/applet/resources/icedtea-background-*.jpeg: >> Frames for the loading animation. > > Very cute, but 60 frames, 55K each, adding 3MB... > Could that be reduced a bit please. > You should have seen the original version: 12MB :) I will try and cut down the size. What would be an acceptable upper limit? 1Mb? 500k? 100k? Cheers, Omair From mark at klomp.org Wed May 27 14:05:22 2009 From: mark at klomp.org (Mark Wielaard) Date: Wed, 27 May 2009 23:05:22 +0200 Subject: RFC: Loading animation for applets In-Reply-To: <4A1DA69C.60000@redhat.com> References: <4A1D5F57.5040101@redhat.com> <1243454903.3818.30.camel@hermans.wildebeest.org> <4A1DA69C.60000@redhat.com> Message-ID: <1243458322.3818.35.camel@hermans.wildebeest.org> On Wed, 2009-05-27 at 16:46 -0400, Omair Majid wrote: > >> * plugin/icedtea/sun/applet/resources/icedtea-background-*.jpeg: > >> Frames for the loading animation. > > > > Very cute, but 60 frames, 55K each, adding 3MB... > > Could that be reduced a bit please. > > > > You should have seen the original version: 12MB :) I will try and cut > down the size. What would be an acceptable upper limit? 1Mb? 500k? 100k? Small is beautiful. I would say more towards 100k. Note that the current resources.jar is just 1MB, the whole rt.jar is 60MB. I know, I am a party-pooper. But maybe you can come up with some fancy code to slow fade between just 2 frames and make that look like melting ice with some funky imageio transforms? Cheers, Mark From ahughes at redhat.com Thu May 28 02:15:44 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 28 May 2009 09:15:44 +0000 Subject: changeset in /hg/icedtea: Completely restructure the building an... Message-ID: changeset 31b0ba36a6b7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=31b0ba36a6b7 description: Completely restructure the building and inclusion of netx and plugin code. We were relying on the binary plugs process (and thus importing unneeded SNMP classes). We now use the same method as jaxws, jaxp, langtools and corba, and the binary plugs process is turned off (the default, we were turning it on by setting ALT_BINARY_PLUGS_PATH). 2009-05-27 Andrew John Hughes * overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ClipboardService.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadService.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadServiceListener.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ExtensionInstallerService.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileContents.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileOpenService.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileSaveService.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/JNLPRandomAccessFile.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/PersistenceService.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/PrintService.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManager.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManagerStub.java, * overlays/openjdk/jdk/src/share/classes/javax/jnlp/UnavailableServiceException.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/AppletDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ApplicationDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ComponentDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/DefaultLaunchHandler.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ExtensionDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/IconDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InformationDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InstallerDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JREDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchException.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchHandler.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Node.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PackageDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ParseException.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PropertyDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ResourcesDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/SecurityDesc.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Version.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheEntry.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheUtil.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DownloadIndicator.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/package.html, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationEvent.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationListener.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadEvent.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadListener.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/package.html, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/package.html, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Manifest.mf, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Messages.properties, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/about.jnlp, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/default.jnlp, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppThreadGroup.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletAudioClip.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletEnvironment.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletInstance.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/ApplicationInstance.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot13.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/package.html, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AppletWarningPane.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertVerifier.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertWarningPane.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertsInfoPane.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/HttpsCertVerifier.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/MoreInfoPane.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityDialogUI.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityUtil.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityWarningDialog.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SingleCertInfoPane.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/VariableX509TrustManager.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificatePane.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificateViewer.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/ServiceUtil.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XBasicService.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XClipboardService.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XDownloadService.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XExtensionInstallerService.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileContents.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileOpenService.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileSaveService.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPersistenceService.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPrintService.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XServiceManagerStub.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/package.html, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/CharacterEncoder.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/HexDumpEncoder.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarRunner.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSignerResources.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyStoreUtil.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyTool.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/PropertiesFile.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/Reflect.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/WeakList.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLElement.java, * overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLParseException.java: Moved to... * Makefile.am: Remove use of ALT_BINARY_PLUGS_PATH (and thus turn off the binary plugs build), add a INITIAL_BOOTSTRAP_LINK_STAMP target which allows us to depend on $(ICEDTEA_BOOT_DIR) for both types of build, output to lib/tools.jar not jre/lib/tools.jar, add targets for building netx and liveconnect classes and make icedtea targets dependent on this. * netx/javax/jnlp/BasicService.java, * netx/javax/jnlp/ClipboardService.java, * netx/javax/jnlp/DownloadService.java, * netx/javax/jnlp/DownloadServiceListener.java, * netx/javax/jnlp/ExtensionInstallerService.java, * netx/javax/jnlp/FileContents.java, * netx/javax/jnlp/FileOpenService.java, * netx/javax/jnlp/FileSaveService.java, * netx/javax/jnlp/JNLPRandomAccessFile.java, * netx/javax/jnlp/PersistenceService.java, * netx/javax/jnlp/PrintService.java, * netx/javax/jnlp/ServiceManager.java, * netx/javax/jnlp/ServiceManagerStub.java, * netx/javax/jnlp/UnavailableServiceException.java, * netx/net/sourceforge/jnlp/AppletDesc.java, * netx/net/sourceforge/jnlp/ApplicationDesc.java, * netx/net/sourceforge/jnlp/ComponentDesc.java, * netx/net/sourceforge/jnlp/DefaultLaunchHandler.java, * netx/net/sourceforge/jnlp/ExtensionDesc.java, * netx/net/sourceforge/jnlp/IconDesc.java, * netx/net/sourceforge/jnlp/InformationDesc.java, * netx/net/sourceforge/jnlp/InstallerDesc.java, * netx/net/sourceforge/jnlp/JARDesc.java, * netx/net/sourceforge/jnlp/JNLPFile.java, * netx/net/sourceforge/jnlp/JNLPSplashScreen.java, * netx/net/sourceforge/jnlp/JREDesc.java, * netx/net/sourceforge/jnlp/LaunchException.java, * netx/net/sourceforge/jnlp/LaunchHandler.java, * netx/net/sourceforge/jnlp/Launcher.java, * netx/net/sourceforge/jnlp/NetxPanel.java, * netx/net/sourceforge/jnlp/Node.java, * netx/net/sourceforge/jnlp/PackageDesc.java, * netx/net/sourceforge/jnlp/ParseException.java, * netx/net/sourceforge/jnlp/Parser.java, * netx/net/sourceforge/jnlp/PluginBridge.java, * netx/net/sourceforge/jnlp/PropertyDesc.java, * netx/net/sourceforge/jnlp/ResourcesDesc.java, * netx/net/sourceforge/jnlp/SecurityDesc.java, * netx/net/sourceforge/jnlp/Version.java, * netx/net/sourceforge/jnlp/cache/CacheEntry.java, * netx/net/sourceforge/jnlp/cache/CacheUtil.java, * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java, * netx/net/sourceforge/jnlp/cache/DownloadIndicator.java, * netx/net/sourceforge/jnlp/cache/Resource.java, * netx/net/sourceforge/jnlp/cache/ResourceTracker.java, * netx/net/sourceforge/jnlp/cache/UpdatePolicy.java, * netx/net/sourceforge/jnlp/cache/package.html, * netx/net/sourceforge/jnlp/event/ApplicationEvent.java, * netx/net/sourceforge/jnlp/event/ApplicationListener.java, * netx/net/sourceforge/jnlp/event/DownloadEvent.java, * netx/net/sourceforge/jnlp/event/DownloadListener.java, * netx/net/sourceforge/jnlp/event/package.html, * netx/net/sourceforge/jnlp/package.html, * netx/net/sourceforge/jnlp/resources/Manifest.mf, * netx/net/sourceforge/jnlp/resources/Messages.properties, * netx/net/sourceforge/jnlp/resources/about.jnlp, * netx/net/sourceforge/jnlp/resources/default.jnlp, * netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java, * netx/net/sourceforge/jnlp/runtime/AppletAudioClip.java, * netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java, * netx/net/sourceforge/jnlp/runtime/AppletInstance.java, * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java, * netx/net/sourceforge/jnlp/runtime/Boot.java, * netx/net/sourceforge/jnlp/runtime/Boot13.java, * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java, * netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java, * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java, * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java, * netx/net/sourceforge/jnlp/runtime/package.html, * netx/net/sourceforge/jnlp/security/AccessWarningPane.java, * netx/net/sourceforge/jnlp/security/AppletWarningPane.java, * netx/net/sourceforge/jnlp/security/CertVerifier.java, * netx/net/sourceforge/jnlp/security/CertWarningPane.java, * netx/net/sourceforge/jnlp/security/CertsInfoPane.java, * netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java, * netx/net/sourceforge/jnlp/security/MoreInfoPane.java, * netx/net/sourceforge/jnlp/security/SecurityDialogUI.java, * netx/net/sourceforge/jnlp/security/SecurityUtil.java, * netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java, * netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java, * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java, * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java, * netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java, * netx/net/sourceforge/jnlp/services/ServiceUtil.java, * netx/net/sourceforge/jnlp/services/XBasicService.java, * netx/net/sourceforge/jnlp/services/XClipboardService.java, * netx/net/sourceforge/jnlp/services/XDownloadService.java, * netx/net/sourceforge/jnlp/services/XExtensionInstallerService.java, * netx/net/sourceforge/jnlp/services/XFileContents.java, * netx/net/sourceforge/jnlp/services/XFileOpenService.java, * netx/net/sourceforge/jnlp/services/XFileSaveService.java, * netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java, * netx/net/sourceforge/jnlp/services/XPersistenceService.java, * netx/net/sourceforge/jnlp/services/XPrintService.java, * netx/net/sourceforge/jnlp/services/XServiceManagerStub.java, * netx/net/sourceforge/jnlp/services/package.html, * netx/net/sourceforge/jnlp/tools/CharacterEncoder.java, * netx/net/sourceforge/jnlp/tools/HexDumpEncoder.java, * netx/net/sourceforge/jnlp/tools/JarRunner.java, * netx/net/sourceforge/jnlp/tools/JarSigner.java, * netx/net/sourceforge/jnlp/tools/JarSignerResources.java, * netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java, * netx/net/sourceforge/jnlp/tools/KeyTool.java, * netx/net/sourceforge/jnlp/util/PropertiesFile.java, * netx/net/sourceforge/jnlp/util/Reflect.java, * netx/net/sourceforge/jnlp/util/WeakList.java, * netx/net/sourceforge/nanoxml/XMLElement.java, * netx/net/sourceforge/nanoxml/XMLParseException.java: to here. * patches/ecj/icedtea.patch: Recreated. * patches/icedtea-ant.patch: Remove hack to jaxws which uses plugs directory (now undefined). * patches/icedtea-javac-debuginfo.patch: Recreated. * patches/icedtea-netx.patch: Include netx and netscape classes via the same import mechanism as jaxws, jaxp, corba and langtools (extracting a classes.zip). diffstat: 222 files changed, 21056 insertions(+), 20656 deletions(-) ChangeLog | 233 + Makefile.am | 151 - netx/javax/jnlp/BasicService.java | 13 netx/javax/jnlp/ClipboardService.java | 11 netx/javax/jnlp/DownloadService.java | 25 netx/javax/jnlp/DownloadServiceListener.java | 13 netx/javax/jnlp/ExtensionInstallerService.java | 22 netx/javax/jnlp/FileContents.java | 18 netx/javax/jnlp/FileOpenService.java | 11 netx/javax/jnlp/FileSaveService.java | 11 netx/javax/jnlp/JNLPRandomAccessFile.java | 46 netx/javax/jnlp/PersistenceService.java | 18 netx/javax/jnlp/PrintService.java | 13 netx/javax/jnlp/ServiceManager.java | 54 netx/javax/jnlp/ServiceManagerStub.java | 11 netx/javax/jnlp/UnavailableServiceException.java | 16 netx/net/sourceforge/jnlp/AppletDesc.java | 125 netx/net/sourceforge/jnlp/ApplicationDesc.java | 76 netx/net/sourceforge/jnlp/ComponentDesc.java | 43 netx/net/sourceforge/jnlp/DefaultLaunchHandler.java | 114 netx/net/sourceforge/jnlp/ExtensionDesc.java | 157 + netx/net/sourceforge/jnlp/IconDesc.java | 135 + netx/net/sourceforge/jnlp/InformationDesc.java | 241 + netx/net/sourceforge/jnlp/InstallerDesc.java | 54 netx/net/sourceforge/jnlp/JARDesc.java | 144 + netx/net/sourceforge/jnlp/JNLPFile.java | 523 +++ netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 93 netx/net/sourceforge/jnlp/JREDesc.java | 123 netx/net/sourceforge/jnlp/LaunchException.java | 190 + netx/net/sourceforge/jnlp/LaunchHandler.java | 68 netx/net/sourceforge/jnlp/Launcher.java | 710 +++++ netx/net/sourceforge/jnlp/NetxPanel.java | 150 + netx/net/sourceforge/jnlp/Node.java | 147 + netx/net/sourceforge/jnlp/PackageDesc.java | 105 netx/net/sourceforge/jnlp/ParseException.java | 94 netx/net/sourceforge/jnlp/Parser.java | 979 +++++++ netx/net/sourceforge/jnlp/PluginBridge.java | 250 + netx/net/sourceforge/jnlp/PropertyDesc.java | 66 netx/net/sourceforge/jnlp/ResourcesDesc.java | 231 + netx/net/sourceforge/jnlp/SecurityDesc.java | 173 + netx/net/sourceforge/jnlp/Version.java | 354 ++ netx/net/sourceforge/jnlp/cache/CacheEntry.java | 174 + netx/net/sourceforge/jnlp/cache/CacheUtil.java | 394 ++ netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 321 ++ netx/net/sourceforge/jnlp/cache/DownloadIndicator.java | 92 netx/net/sourceforge/jnlp/cache/Resource.java | 282 ++ netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 973 +++++++ netx/net/sourceforge/jnlp/cache/UpdatePolicy.java | 90 netx/net/sourceforge/jnlp/cache/package.html | 28 netx/net/sourceforge/jnlp/event/ApplicationEvent.java | 57 netx/net/sourceforge/jnlp/event/ApplicationListener.java | 38 netx/net/sourceforge/jnlp/event/DownloadEvent.java | 72 netx/net/sourceforge/jnlp/event/DownloadListener.java | 51 netx/net/sourceforge/jnlp/event/package.html | 28 netx/net/sourceforge/jnlp/package.html | 30 netx/net/sourceforge/jnlp/resources/Manifest.mf | 6 netx/net/sourceforge/jnlp/resources/Messages.properties | 163 + netx/net/sourceforge/jnlp/resources/about.jnlp | 20 netx/net/sourceforge/jnlp/resources/default.jnlp | 20 netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java | 68 netx/net/sourceforge/jnlp/runtime/AppletAudioClip.java | 109 netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 354 ++ netx/net/sourceforge/jnlp/runtime/AppletInstance.java | 139 + netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 248 + netx/net/sourceforge/jnlp/runtime/Boot.java | 442 +++ netx/net/sourceforge/jnlp/runtime/Boot13.java | 103 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 986 +++++++ netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 105 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 496 +++ netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 490 +++ netx/net/sourceforge/jnlp/runtime/package.html | 29 netx/net/sourceforge/jnlp/security/AccessWarningPane.java | 212 + netx/net/sourceforge/jnlp/security/AppletWarningPane.java | 121 netx/net/sourceforge/jnlp/security/CertVerifier.java | 92 netx/net/sourceforge/jnlp/security/CertWarningPane.java | 287 ++ netx/net/sourceforge/jnlp/security/CertsInfoPane.java | 357 ++ netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 175 + netx/net/sourceforge/jnlp/security/MoreInfoPane.java | 127 netx/net/sourceforge/jnlp/security/SecurityDialogUI.java | 204 + netx/net/sourceforge/jnlp/security/SecurityUtil.java | 200 + netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 429 +++ netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 78 netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 219 + netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 350 ++ netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 + netx/net/sourceforge/jnlp/services/ServiceUtil.java | 214 + netx/net/sourceforge/jnlp/services/XBasicService.java | 174 + netx/net/sourceforge/jnlp/services/XClipboardService.java | 81 netx/net/sourceforge/jnlp/services/XDownloadService.java | 181 + netx/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 123 netx/net/sourceforge/jnlp/services/XFileContents.java | 123 netx/net/sourceforge/jnlp/services/XFileOpenService.java | 113 netx/net/sourceforge/jnlp/services/XFileSaveService.java | 140 + netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java | 208 + netx/net/sourceforge/jnlp/services/XPersistenceService.java | 179 + netx/net/sourceforge/jnlp/services/XPrintService.java | 123 netx/net/sourceforge/jnlp/services/XServiceManagerStub.java | 104 netx/net/sourceforge/jnlp/services/package.html | 29 netx/net/sourceforge/jnlp/tools/CharacterEncoder.java | 354 ++ netx/net/sourceforge/jnlp/tools/HexDumpEncoder.java | 120 netx/net/sourceforge/jnlp/tools/JarRunner.java | 15 netx/net/sourceforge/jnlp/tools/JarSigner.java | 544 ++++ netx/net/sourceforge/jnlp/tools/JarSignerResources.java | 212 + netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69 netx/net/sourceforge/jnlp/tools/KeyTool.java | 478 +++ netx/net/sourceforge/jnlp/util/PropertiesFile.java | 148 + netx/net/sourceforge/jnlp/util/Reflect.java | 148 + netx/net/sourceforge/jnlp/util/WeakList.java | 128 netx/net/sourceforge/nanoxml/XMLElement.java | 1334 ++++++++++ netx/net/sourceforge/nanoxml/XMLParseException.java | 130 overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java | 13 overlays/openjdk/jdk/src/share/classes/javax/jnlp/ClipboardService.java | 11 overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadService.java | 25 overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadServiceListener.java | 13 overlays/openjdk/jdk/src/share/classes/javax/jnlp/ExtensionInstallerService.java | 22 overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileContents.java | 18 overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileOpenService.java | 11 overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileSaveService.java | 11 overlays/openjdk/jdk/src/share/classes/javax/jnlp/JNLPRandomAccessFile.java | 46 overlays/openjdk/jdk/src/share/classes/javax/jnlp/PersistenceService.java | 18 overlays/openjdk/jdk/src/share/classes/javax/jnlp/PrintService.java | 13 overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManager.java | 54 overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManagerStub.java | 11 overlays/openjdk/jdk/src/share/classes/javax/jnlp/UnavailableServiceException.java | 16 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/AppletDesc.java | 125 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ApplicationDesc.java | 76 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ComponentDesc.java | 43 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/DefaultLaunchHandler.java | 114 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ExtensionDesc.java | 157 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/IconDesc.java | 135 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InformationDesc.java | 241 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InstallerDesc.java | 54 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java | 144 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java | 523 --- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java | 93 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JREDesc.java | 123 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchException.java | 190 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchHandler.java | 68 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java | 710 ----- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java | 150 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Node.java | 147 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PackageDesc.java | 105 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ParseException.java | 94 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java | 979 ------- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java | 250 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PropertyDesc.java | 66 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ResourcesDesc.java | 231 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/SecurityDesc.java | 173 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Version.java | 354 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheEntry.java | 174 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheUtil.java | 394 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 321 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DownloadIndicator.java | 92 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java | 282 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java | 973 ------- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java | 90 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/package.html | 28 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationEvent.java | 57 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationListener.java | 38 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadEvent.java | 72 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadListener.java | 51 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/package.html | 28 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/package.html | 30 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Manifest.mf | 6 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Messages.properties | 163 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/about.jnlp | 20 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/default.jnlp | 20 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppThreadGroup.java | 68 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletAudioClip.java | 109 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 354 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletInstance.java | 139 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 248 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java | 442 --- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot13.java | 103 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 986 ------- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 105 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 496 --- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 490 --- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/package.html | 29 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java | 212 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AppletWarningPane.java | 121 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertVerifier.java | 92 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertWarningPane.java | 287 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertsInfoPane.java | 357 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 175 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/MoreInfoPane.java | 127 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityDialogUI.java | 204 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityUtil.java | 200 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 429 --- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 78 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 219 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 350 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/ServiceUtil.java | 214 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XBasicService.java | 174 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XClipboardService.java | 81 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XDownloadService.java | 181 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 123 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileContents.java | 123 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileOpenService.java | 113 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileSaveService.java | 140 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java | 208 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPersistenceService.java | 179 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPrintService.java | 123 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XServiceManagerStub.java | 104 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/package.html | 29 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/CharacterEncoder.java | 354 -- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/HexDumpEncoder.java | 120 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarRunner.java | 15 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java | 544 ---- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSignerResources.java | 212 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69 overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyTool.java | 478 --- overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/PropertiesFile.java | 148 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/Reflect.java | 148 - overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/WeakList.java | 128 overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLElement.java | 1334 ---------- overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLParseException.java | 130 patches/ecj/icedtea.patch | 149 - patches/icedtea-ant.patch | 11 patches/icedtea-javac-debuginfo.patch | 30 patches/icedtea-netx.patch | 126 diffs (truncated from 43159 to 500 lines): diff -r cecded2429ca -r 31b0ba36a6b7 ChangeLog --- a/ChangeLog Wed May 27 20:20:48 2009 +0100 +++ b/ChangeLog Thu May 28 10:18:19 2009 +0100 @@ -1,3 +1,236 @@ 2009-05-27 Andrew John Hughes + + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ClipboardService.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadService.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadServiceListener.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ExtensionInstallerService.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileContents.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileOpenService.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileSaveService.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/JNLPRandomAccessFile.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/PersistenceService.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/PrintService.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManager.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManagerStub.java, + * overlays/openjdk/jdk/src/share/classes/javax/jnlp/UnavailableServiceException.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/AppletDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ApplicationDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ComponentDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/DefaultLaunchHandler.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ExtensionDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/IconDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InformationDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InstallerDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JREDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchException.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchHandler.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Node.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PackageDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ParseException.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PropertyDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ResourcesDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/SecurityDesc.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Version.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheEntry.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheUtil.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DownloadIndicator.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/package.html, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationEvent.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationListener.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadEvent.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadListener.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/package.html, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/package.html, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Manifest.mf, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Messages.properties, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/about.jnlp, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/default.jnlp, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppThreadGroup.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletAudioClip.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletEnvironment.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletInstance.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/ApplicationInstance.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot13.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/package.html, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AppletWarningPane.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertVerifier.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertWarningPane.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertsInfoPane.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/HttpsCertVerifier.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/MoreInfoPane.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityDialogUI.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityUtil.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityWarningDialog.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SingleCertInfoPane.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/VariableX509TrustManager.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificatePane.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificateViewer.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/ServiceUtil.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XBasicService.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XClipboardService.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XDownloadService.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XExtensionInstallerService.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileContents.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileOpenService.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileSaveService.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPersistenceService.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPrintService.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XServiceManagerStub.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/package.html, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/CharacterEncoder.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/HexDumpEncoder.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarRunner.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSignerResources.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyStoreUtil.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyTool.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/PropertiesFile.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/Reflect.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/WeakList.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLElement.java, + * overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLParseException.java: + Moved to... + * Makefile.am: + Remove use of ALT_BINARY_PLUGS_PATH (and thus turn off the binary plugs build), + add a INITIAL_BOOTSTRAP_LINK_STAMP target which allows us to depend on $(ICEDTEA_BOOT_DIR) + for both types of build, output to lib/tools.jar not jre/lib/tools.jar, add targets + for building netx and liveconnect classes and make icedtea targets dependent on this. + * netx/javax/jnlp/BasicService.java, + * netx/javax/jnlp/ClipboardService.java, + * netx/javax/jnlp/DownloadService.java, + * netx/javax/jnlp/DownloadServiceListener.java, + * netx/javax/jnlp/ExtensionInstallerService.java, + * netx/javax/jnlp/FileContents.java, + * netx/javax/jnlp/FileOpenService.java, + * netx/javax/jnlp/FileSaveService.java, + * netx/javax/jnlp/JNLPRandomAccessFile.java, + * netx/javax/jnlp/PersistenceService.java, + * netx/javax/jnlp/PrintService.java, + * netx/javax/jnlp/ServiceManager.java, + * netx/javax/jnlp/ServiceManagerStub.java, + * netx/javax/jnlp/UnavailableServiceException.java, + * netx/net/sourceforge/jnlp/AppletDesc.java, + * netx/net/sourceforge/jnlp/ApplicationDesc.java, + * netx/net/sourceforge/jnlp/ComponentDesc.java, + * netx/net/sourceforge/jnlp/DefaultLaunchHandler.java, + * netx/net/sourceforge/jnlp/ExtensionDesc.java, + * netx/net/sourceforge/jnlp/IconDesc.java, + * netx/net/sourceforge/jnlp/InformationDesc.java, + * netx/net/sourceforge/jnlp/InstallerDesc.java, + * netx/net/sourceforge/jnlp/JARDesc.java, + * netx/net/sourceforge/jnlp/JNLPFile.java, + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java, + * netx/net/sourceforge/jnlp/JREDesc.java, + * netx/net/sourceforge/jnlp/LaunchException.java, + * netx/net/sourceforge/jnlp/LaunchHandler.java, + * netx/net/sourceforge/jnlp/Launcher.java, + * netx/net/sourceforge/jnlp/NetxPanel.java, + * netx/net/sourceforge/jnlp/Node.java, + * netx/net/sourceforge/jnlp/PackageDesc.java, + * netx/net/sourceforge/jnlp/ParseException.java, + * netx/net/sourceforge/jnlp/Parser.java, + * netx/net/sourceforge/jnlp/PluginBridge.java, + * netx/net/sourceforge/jnlp/PropertyDesc.java, + * netx/net/sourceforge/jnlp/ResourcesDesc.java, + * netx/net/sourceforge/jnlp/SecurityDesc.java, + * netx/net/sourceforge/jnlp/Version.java, + * netx/net/sourceforge/jnlp/cache/CacheEntry.java, + * netx/net/sourceforge/jnlp/cache/CacheUtil.java, + * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java, + * netx/net/sourceforge/jnlp/cache/DownloadIndicator.java, + * netx/net/sourceforge/jnlp/cache/Resource.java, + * netx/net/sourceforge/jnlp/cache/ResourceTracker.java, + * netx/net/sourceforge/jnlp/cache/UpdatePolicy.java, + * netx/net/sourceforge/jnlp/cache/package.html, + * netx/net/sourceforge/jnlp/event/ApplicationEvent.java, + * netx/net/sourceforge/jnlp/event/ApplicationListener.java, + * netx/net/sourceforge/jnlp/event/DownloadEvent.java, + * netx/net/sourceforge/jnlp/event/DownloadListener.java, + * netx/net/sourceforge/jnlp/event/package.html, + * netx/net/sourceforge/jnlp/package.html, + * netx/net/sourceforge/jnlp/resources/Manifest.mf, + * netx/net/sourceforge/jnlp/resources/Messages.properties, + * netx/net/sourceforge/jnlp/resources/about.jnlp, + * netx/net/sourceforge/jnlp/resources/default.jnlp, + * netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java, + * netx/net/sourceforge/jnlp/runtime/AppletAudioClip.java, + * netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java, + * netx/net/sourceforge/jnlp/runtime/AppletInstance.java, + * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java, + * netx/net/sourceforge/jnlp/runtime/Boot.java, + * netx/net/sourceforge/jnlp/runtime/Boot13.java, + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java, + * netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java, + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java, + * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java, + * netx/net/sourceforge/jnlp/runtime/package.html, + * netx/net/sourceforge/jnlp/security/AccessWarningPane.java, + * netx/net/sourceforge/jnlp/security/AppletWarningPane.java, + * netx/net/sourceforge/jnlp/security/CertVerifier.java, + * netx/net/sourceforge/jnlp/security/CertWarningPane.java, + * netx/net/sourceforge/jnlp/security/CertsInfoPane.java, + * netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java, + * netx/net/sourceforge/jnlp/security/MoreInfoPane.java, + * netx/net/sourceforge/jnlp/security/SecurityDialogUI.java, + * netx/net/sourceforge/jnlp/security/SecurityUtil.java, + * netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java, + * netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java, + * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java, + * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java, + * netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java, + * netx/net/sourceforge/jnlp/services/ServiceUtil.java, + * netx/net/sourceforge/jnlp/services/XBasicService.java, + * netx/net/sourceforge/jnlp/services/XClipboardService.java, + * netx/net/sourceforge/jnlp/services/XDownloadService.java, + * netx/net/sourceforge/jnlp/services/XExtensionInstallerService.java, + * netx/net/sourceforge/jnlp/services/XFileContents.java, + * netx/net/sourceforge/jnlp/services/XFileOpenService.java, + * netx/net/sourceforge/jnlp/services/XFileSaveService.java, + * netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java, + * netx/net/sourceforge/jnlp/services/XPersistenceService.java, + * netx/net/sourceforge/jnlp/services/XPrintService.java, + * netx/net/sourceforge/jnlp/services/XServiceManagerStub.java, + * netx/net/sourceforge/jnlp/services/package.html, + * netx/net/sourceforge/jnlp/tools/CharacterEncoder.java, + * netx/net/sourceforge/jnlp/tools/HexDumpEncoder.java, + * netx/net/sourceforge/jnlp/tools/JarRunner.java, + * netx/net/sourceforge/jnlp/tools/JarSigner.java, + * netx/net/sourceforge/jnlp/tools/JarSignerResources.java, + * netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java, + * netx/net/sourceforge/jnlp/tools/KeyTool.java, + * netx/net/sourceforge/jnlp/util/PropertiesFile.java, + * netx/net/sourceforge/jnlp/util/Reflect.java, + * netx/net/sourceforge/jnlp/util/WeakList.java, + * netx/net/sourceforge/nanoxml/XMLElement.java, + * netx/net/sourceforge/nanoxml/XMLParseException.java: to here. + * patches/ecj/icedtea.patch: + Recreated. + * patches/icedtea-ant.patch: + Remove hack to jaxws which uses plugs directory (now undefined). + * patches/icedtea-javac-debuginfo.patch: Recreated. + * patches/icedtea-netx.patch: + Include netx and netscape classes via the same import mechanism + as jaxws, jaxp, corba and langtools (extracting a classes.zip). + 2009-05-27 Andrew John Hughes * Makefile.am: diff -r cecded2429ca -r 31b0ba36a6b7 Makefile.am --- a/Makefile.am Wed May 27 20:20:48 2009 +0100 +++ b/Makefile.am Thu May 28 10:18:19 2009 +0100 @@ -26,14 +26,14 @@ ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlu ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch -LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net +LIVECONNECT_DIR = -C lib/rt netscape JNLP_ABOUT_TARGET = extra-lib/about.jar else if ENABLE_PLUGIN ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so PLUGIN_PATCH = patches/icedtea-liveconnect.patch -LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net +LIVECONNECT_DIR = -C lib/rt netscape JNLP_ABOUT_TARGET = extra-lib/about.jar else ICEDTEAPLUGIN_CLEAN = @@ -62,6 +62,18 @@ if ENABLE_NIMBUS_GENERATION if ENABLE_NIMBUS_GENERATION JIBX_DEPS_DIR=$(abs_top_builddir)/jibx endif + +SHARE = openjdk/jdk/src/share/classes +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 = \ + $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) + +SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS) # Top-Level Targets # ================= @@ -1527,7 +1539,6 @@ ICEDTEA_ENV = \ "LANG=C" \ "PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \ "ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \ - "ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \ "ICEDTEA_RT=$(ICEDTEA_RT)" \ "ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \ @@ -1556,7 +1567,9 @@ ICEDTEA_ENV = \ "JAVAC=" \ "RHINO_JAR=$(RHINO_JAR)" \ "DISTRIBUTION_ID=$(DIST_ID)" \ - "ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" + "ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \ + "ALT_NETX_DIST=$(abs_top_builddir)/netx" \ + "ALT_LIVECONNECT_DIST=$(abs_top_builddir)" if WITH_CACAO ICEDTEA_ENV += \ @@ -1603,7 +1616,6 @@ ICEDTEA_ENV_ECJ = \ "LANG=C" \ "PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \ "ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \ - "ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \ "ICEDTEA_RT=$(ICEDTEA_RT)" \ "ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \ @@ -1639,7 +1651,9 @@ ICEDTEA_ENV_ECJ = \ "JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \ "JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \ "JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)" \ - "DISABLE_NIMBUS=true" + "DISABLE_NIMBUS=true" \ + "ALT_NETX_DIST=$(abs_top_builddir)/netx" \ + "ALT_LIVECONNECT_DIST=$(abs_top_builddir)" if WITH_CACAO ICEDTEA_ENV_ECJ += \ @@ -2060,6 +2074,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-xml-encodinginfo.patch \ patches/icedtea-cc-interp-backedge.patch \ + patches/icedtea-netx.patch \ $(DISTRIBUTION_PATCHES) if WITH_RHINO @@ -2277,12 +2292,12 @@ stamps/patch.stamp: stamps/patch-fsg.sta test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \ fi ; \ done ; \ - mv stamps/patch.stamp.tmp stamps/patch.stamp ; \ if ! test x$${all_patches_ok} = "xyes"; then \ echo ERROR patch $${all_patches_ok} FAILED! ; \ echo WARNING make clean-patch before retrying a fix ; \ exit 2; \ - fi + fi ; \ + mv stamps/patch.stamp.tmp stamps/patch.stamp if ENABLE_NPPLUGIN cp -a $(abs_top_srcdir)/plugin/icedteanp/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/ @@ -2539,13 +2554,16 @@ if WITH_OPENJDK if WITH_OPENJDK BOOTSTRAP_DIRECTORY_STAMP = ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR) + INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp else if WITH_ICEDTEA BOOTSTRAP_DIRECTORY_STAMP = ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR) + INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp else BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea + INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp endif endif @@ -2601,10 +2619,10 @@ stamps/bootstrap-directory-ecj.stamp: st rm -f bootstrap/ecj/include/$$i; \ ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \ done; \ - if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \ + if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar ; \ then \ mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \ - ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \ + ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \ $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar ; \ fi if test -f \ @@ -2654,7 +2672,8 @@ else ICEDTEA_DEBUG_BUILD_TARGET=debug_build endif -NETX_RESOURCE_DIR=openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources +NETX_DIR=$(abs_top_srcdir)/netx/net/sourceforge +NETX_RESOURCE_DIR=$(NETX_DIR)/jnlp/resources # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. @@ -2662,8 +2681,8 @@ stamps/icedtea.stamp: stamps/bootstrap-d stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \ - stamps/jibx.stamp stamps/cacao.stamp \ - stamps/pulse-java.stamp stamps/visualvm.stamp + stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \ + stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -2748,8 +2767,8 @@ stamps/icedtea-debug.stamp: stamps/boots stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \ - stamps/jibx.stamp stamps/cacao.stamp \ - stamps/pulse-java.stamp stamps/visualvm.stamp + stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \ + stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -2861,8 +2880,9 @@ endif touch stamps/native-ecj.stamp stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ - stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp + stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/netx-dist.stamp \ + stamps/liveconnect.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp \ + stamps/cacao.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ -C openjdk-ecj \ @@ -2908,7 +2928,7 @@ stamps/plugs.stamp: bootstrap/jdk1.7.0/j mkdir -p stamps touch stamps/plugs.stamp -stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar +stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/lib/tools.jar mkdir -p stamps touch stamps/hotspot-tools.stamp @@ -2919,7 +2939,7 @@ clean-plugs: clean-plugs clean-shared-ob clean-tools-jar: clean-hotspot-tools rm -f stamps/hotspot-tools.stamp - rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar + rm -f bootstrap/jdk1.7.0/lib/tools.jar # Sources copied from OpenJDK. ICEDTEA_COPY_DIRS = \ @@ -2953,16 +2973,6 @@ clean-copy: do \ rm -rf rt/$$copy_dir ; \ done - -SHARE = openjdk/jdk/src/share/classes -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 = \ - $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) # tools.jar class files. stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp @@ -3002,21 +3012,21 @@ hotspot-tools-source-files.txt: stamps/g find hotspot-tools -name '*.java' | sort > $@ mkdir -p lib/hotspot-tools -ABS_SOURCE_DIRS = $(abs_top_builddir)/generated -stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt +stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \ + $(INITIAL_BOOTSTRAP_LINK_STAMP) if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \ -source 1.5 \ -sourcepath \ - 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \ + 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \ -bootclasspath \'\' @$< ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \ -d lib/hotspot-tools \ -source 1.5 \ -sourcepath \ - 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \ + 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \ -bootclasspath \'\' @$< ; \ fi mkdir -p stamps @@ -3029,8 +3039,8 @@ clean-hotspot-tools: rm -f stamps/hotspot-tools-copy-source-files.stamp # tools.jar -bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp - mkdir -p bootstrap/jdk1.7.0/jre/lib/ +bootstrap/jdk1.7.0/lib/tools.jar: stamps/hotspot-tools-class-files.stamp + mkdir -p bootstrap/jdk1.7.0/lib/ if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \ @@ -3045,7 +3055,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st if test -d bootstrap/ecj ; \ then \ mkdir -p bootstrap/ecj/lib/; \ - ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \ + ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \ $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \ fi @@ -3054,20 +3064,20 @@ rt-source-files.txt: stamps/extract.stam find $(abs_top_builddir)/rt -name '*.java' \ | sort -u > $@ -stamps/rt-class-files.stamp: rt-source-files.txt From ahughes at redhat.com Thu May 28 02:15:42 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 28 May 2009 09:15:42 +0000 Subject: changeset in /hg/icedtea: Fix an issue where alternate zip files... Message-ID: changeset cecded2429ca in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cecded2429ca description: Fix an issue where alternate zip files are only used if --with-openjdk-src-zip is set. 2009-05-27 Andrew John Hughes * Makefile.am: Allow setting of some zip files and not others. diffstat: 2 files changed, 33 insertions(+), 27 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 54 +++++++++++++++++++++++++++--------------------------- diffs (99 lines): diff -r caf6ea78c242 -r cecded2429ca ChangeLog --- a/ChangeLog Wed May 27 20:01:08 2009 +0100 +++ b/ChangeLog Wed May 27 20:20:48 2009 +0100 @@ -1,3 +1,9 @@ 2009-05-27 Andrew John Hughes + + * Makefile.am: + Allow setting of some zip files and not + others. + 2009-05-27 Andrew John Hughes * Makefile.am: diff -r caf6ea78c242 -r cecded2429ca Makefile.am --- a/Makefile.am Wed May 27 20:01:08 2009 +0100 +++ b/Makefile.am Wed May 27 20:20:48 2009 +0100 @@ -1693,9 +1693,6 @@ LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langto LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot -if USE_ALT_OPENJDK_SRC_ZIP - OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) -else if USE_HG OPENJDK_SRC_ZIP = CORBA_SRC_ZIP = @@ -1705,18 +1702,41 @@ if USE_HG 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 - HOTSPOT_SRC_ZIP = hotspot.tar.gz -endif -endif - +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 @@ -1727,26 +1747,6 @@ else HS_MD5SUM = $(HOTSPOT_MD5SUM) HS_CHANGESET = $(HOTSPOT_CHANGESET) HS_URL = $(HOTSPOT_URL) -endif - -if USE_ALT_CORBA_SRC_ZIP - CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP) -endif - -if USE_ALT_JAXP_SRC_ZIP - JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP) -endif - -if USE_ALT_JAXWS_SRC_ZIP - JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP) -endif - -if USE_ALT_JDK_SRC_ZIP - JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP) -endif - -if USE_ALT_LANGTOOLS_SRC_ZIP - LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP) endif CACAO_BASE_URL = http://www.complang.tuwien.ac.at From gbenson at redhat.com Thu May 28 02:24:10 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 28 May 2009 10:24:10 +0100 Subject: Zero and Shark article Message-ID: <20090528092410.GB3215@redhat.com> Hi all, There's an article about Zero and Shark on java.net today: http://today.java.net/pub/a/today/2009/05/21/zero-and-shark-openjdk-port.html Cheers, Gary -- http://gbenson.net/ From doko at ubuntu.com Thu May 28 02:40:41 2009 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 28 May 2009 11:40:41 +0200 Subject: documenting the tarballs used for a build Message-ID: <4A1E5C19.5070707@ubuntu.com> Currently all tarballs downloaded are identified by a changeset ID, but there is no documentation which changesets we do choose for a build. Could we document this in some place, which version/tag is used for which tarball? Maybe just add an extra field in hotspot.map? Or maybe rename hotspot.map to sources.map and move the changeset id's and md5sums for the other tarballs into this file? Matthias From gbenson at redhat.com Thu May 28 02:58:16 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 28 May 2009 09:58:16 +0000 Subject: changeset in /hg/icedtea6: 2009-05-28 Gary Benson changeset f78f8e38f872 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f78f8e38f872 description: 2009-05-28 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::is_private_copy): Renamed as... (SharkTopLevelBlock::is_backedge_copy): New method. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::initialize): Use the above. diffstat: 3 files changed, 10 insertions(+), 2 deletions(-) ChangeLog | 8 ++++++++ ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 2 +- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 2 +- diffs (39 lines): diff -r e805128be861 -r f78f8e38f872 ChangeLog --- a/ChangeLog Wed May 27 15:00:40 2009 +0100 +++ b/ChangeLog Thu May 28 05:53:28 2009 -0400 @@ -1,3 +1,11 @@ 2009-05-27 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::is_private_copy): Renamed as... + (SharkTopLevelBlock::is_backedge_copy): New method. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::initialize): Use the above. + 2009-05-27 Gary Benson * ports/hotspot/src/share/vm/shark/sharkFunction.hpp diff -r e805128be861 -r f78f8e38f872 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Wed May 27 15:00:40 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu May 28 05:53:28 2009 -0400 @@ -201,7 +201,7 @@ void SharkTopLevelBlock::initialize() char name[28]; snprintf(name, sizeof(name), "bci_%d%s", - start(), is_private_copy() ? "_private_copy" : ""); + start(), is_backedge_copy() ? "_backedge_copy" : ""); _entry_block = function()->CreateBlock(name); } diff -r e805128be861 -r f78f8e38f872 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Wed May 27 15:00:40 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Thu May 28 05:53:28 2009 -0400 @@ -58,7 +58,7 @@ class SharkTopLevelBlock : public SharkB { return ciblock()->pre_order(); } - bool is_private_copy() const + bool is_backedge_copy() const { return ciblock()->is_backedge_copy(); } From linuxhippy at gmail.com Thu May 28 04:44:16 2009 From: linuxhippy at gmail.com (Clemens Eisserer) Date: Thu, 28 May 2009 07:44:16 -0400 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <17c6771e0905260308s14a81f8es18592db5294a6cda@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <1243007226.3655.122.camel@hermans.wildebeest.org> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> <1243063124.3579.19.camel@hermans.wildebeest.org> <1243205284.30320.15.camel@hermans.wildebeest.org> <17c6771e0905260135t59013f4dwc7ad25dea9520d28@mail.gmail.com> <17c6771e0905260137m15adc51j8c59f4c9494374d1@mail.gmail.com> <1243329380.20462.14.camel@hermans.wildebeest.org> <17c6771e0905260308s14a81f8es18592db5294a6cda@mail.gmail.com> Message-ID: <194f62550905280444i1bc28539j57d0f0800b70ee8b@mail.gmail.com> Hi, Sorry for causing problems and additional work, and thanks for fixing the issues. > Yes, but my point was we wouldn't have run into this issues if > upstream was keeping pace with jdk7 development. ?We have to be > careful which projects we import if we're going to end up maintaining > them over successive jdk7 releases, which happen on a weekly basis. > > Clemens, can you look into incorporating Mark's changes upstream? Yes, I'll do that. Soon I'll replace the current code with the rewrite version, hope it won't be a lot of work integrating it. Thanks, Clemens From gbenson at redhat.com Thu May 28 07:28:11 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 28 May 2009 14:28:11 +0000 Subject: changeset in /hg/icedtea6: 2009-05-28 Gary Benson changeset fbb6b9fbb5a9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fbb6b9fbb5a9 description: 2009-05-28 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::ExceptionAction): New enum. (SharkTopLevelBlock::check_pending_exception): Replace boolean attempt_catch argument with an ExceptionAction. (SharkTopLevelBlock::handle_exception): Likewise. (SharkTopLevelBlock::call_vm): Add an ExceptionAction argument. (SharkTopLevelBlock::acquire_lock): Likewise. (SharkTopLevelBlock::release_lock): Likewise. (SharkTopLevelBlock::call_vm_nocheck): Removed. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::check_pending_exception): Replace boolean attempt_catch argument with an ExceptionAction. (SharkTopLevelBlock::handle_exception): Likewise. (SharkTopLevelBlock::call_vm): Add an ExceptionAction argument. (SharkTopLevelBlock::acquire_lock): Likewise. (SharkTopLevelBlock::release_lock): Likewise. (SharkTopLevelBlock::zero_check_value): Updated. (SharkTopLevelBlock::check_bounds): Likewise. (SharkTopLevelBlock::add_safepoint): Likewise. (SharkTopLevelBlock::call_register_finalizer): Likewise. (SharkTopLevelBlock::handle_return): Likewise. (SharkTopLevelBlock::do_athrow): Likewise. (SharkTopLevelBlock::do_call): Likewise. (SharkTopLevelBlock::do_new): Likewise. (SharkTopLevelBlock::do_newarray): Likewise. (SharkTopLevelBlock::do_anewarray): Likewise. (SharkTopLevelBlock::do_multianewarray): Likewise. (SharkTopLevelBlock::acquire_method_lock): Likewise. (SharkTopLevelBlock::do_monitorenter): Likewise. (SharkTopLevelBlock::do_monitorexit): Likewise. diffstat: 3 files changed, 115 insertions(+), 96 deletions(-) ChangeLog | 34 +++++ ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 80 ++++++------ ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 97 +++++---------- diffs (416 lines): diff -r f78f8e38f872 -r fbb6b9fbb5a9 ChangeLog --- a/ChangeLog Thu May 28 05:53:28 2009 -0400 +++ b/ChangeLog Thu May 28 10:23:21 2009 -0400 @@ -1,3 +1,37 @@ 2009-05-28 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::ExceptionAction): New enum. + (SharkTopLevelBlock::check_pending_exception): Replace + boolean attempt_catch argument with an ExceptionAction. + (SharkTopLevelBlock::handle_exception): Likewise. + (SharkTopLevelBlock::call_vm): Add an ExceptionAction argument. + (SharkTopLevelBlock::acquire_lock): Likewise. + (SharkTopLevelBlock::release_lock): Likewise. + (SharkTopLevelBlock::call_vm_nocheck): Removed. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::check_pending_exception): Replace + boolean attempt_catch argument with an ExceptionAction. + (SharkTopLevelBlock::handle_exception): Likewise. + (SharkTopLevelBlock::call_vm): Add an ExceptionAction argument. + (SharkTopLevelBlock::acquire_lock): Likewise. + (SharkTopLevelBlock::release_lock): Likewise. + (SharkTopLevelBlock::zero_check_value): Updated. + (SharkTopLevelBlock::check_bounds): Likewise. + (SharkTopLevelBlock::add_safepoint): Likewise. + (SharkTopLevelBlock::call_register_finalizer): Likewise. + (SharkTopLevelBlock::handle_return): Likewise. + (SharkTopLevelBlock::do_athrow): Likewise. + (SharkTopLevelBlock::do_call): Likewise. + (SharkTopLevelBlock::do_new): Likewise. + (SharkTopLevelBlock::do_newarray): Likewise. + (SharkTopLevelBlock::do_anewarray): Likewise. + (SharkTopLevelBlock::do_multianewarray): Likewise. + (SharkTopLevelBlock::acquire_method_lock): Likewise. + (SharkTopLevelBlock::do_monitorenter): Likewise. + (SharkTopLevelBlock::do_monitorexit): Likewise. + 2009-05-28 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp diff -r f78f8e38f872 -r fbb6b9fbb5a9 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu May 28 05:53:28 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu May 28 10:23:21 2009 -0400 @@ -294,15 +294,16 @@ void SharkTopLevelBlock::zero_check_valu builder()->SetInsertPoint(zero_block); if (value->is_jobject()) { - call_vm_nocheck( + call_vm( SharkRuntime::throw_NullPointerException(), builder()->pointer_constant(__FILE__), - LLVMValue::jint_constant(__LINE__)); + LLVMValue::jint_constant(__LINE__), + EX_CHECK_NONE); } else { builder()->CreateUnimplemented(__FILE__, __LINE__); } - handle_exception(function()->CreateGetPendingException()); + handle_exception(function()->CreateGetPendingException(), EX_CHECK_FULL); } void SharkTopLevelBlock::check_bounds(SharkValue* array, SharkValue* index) @@ -318,19 +319,22 @@ void SharkTopLevelBlock::check_bounds(Sh builder()->SetInsertPoint(out_of_bounds); SharkState *saved_state = current_state()->copy(); - call_vm_nocheck( + call_vm( SharkRuntime::throw_ArrayIndexOutOfBoundsException(), builder()->pointer_constant(__FILE__), LLVMValue::jint_constant(__LINE__), - index->jint_value()); - handle_exception(function()->CreateGetPendingException()); + index->jint_value(), + EX_CHECK_NONE); + handle_exception(function()->CreateGetPendingException(), EX_CHECK_FULL); set_current_state(saved_state); builder()->SetInsertPoint(in_bounds); } -void SharkTopLevelBlock::check_pending_exception(bool attempt_catch) -{ +void SharkTopLevelBlock::check_pending_exception(ExceptionAction action) +{ + assert(action != EX_CHECK_NONE, "shouldn't be"); + BasicBlock *exception = function()->CreateBlock("exception"); BasicBlock *no_exception = function()->CreateBlock("no_exception"); @@ -345,15 +349,16 @@ void SharkTopLevelBlock::check_pending_e builder()->SetInsertPoint(exception); builder()->CreateStore(LLVMValue::null(), pending_exception_addr); SharkState *saved_state = current_state()->copy(); - handle_exception(pending_exception, attempt_catch); + handle_exception(pending_exception, action); set_current_state(saved_state); builder()->SetInsertPoint(no_exception); } -void SharkTopLevelBlock::handle_exception(Value* exception, bool attempt_catch) -{ - if (attempt_catch && num_exceptions() != 0) { +void SharkTopLevelBlock::handle_exception(Value* exception, + ExceptionAction action) +{ + if (action == EX_CHECK_FULL && num_exceptions() != 0) { // Clear the stack and push the exception onto it. // We do this now to protect it across the VM call // we may be about to make. @@ -392,11 +397,11 @@ void SharkTopLevelBlock::handle_exceptio LLVMValue::jint_constant(indexes[i]), builder()->CreateStructGEP(options, i)); - Value *index = call_vm_nocheck( + Value *index = call_vm( SharkRuntime::find_exception_handler(), builder()->CreateStructGEP(options, 0), - LLVMValue::jint_constant(num_options)); - check_pending_exception(false); + LLVMValue::jint_constant(num_options), + EX_CHECK_NO_CATCH); // Jump to the exception handler, if found BasicBlock *no_handler = function()->CreateBlock("no_handler"); @@ -451,7 +456,7 @@ void SharkTopLevelBlock::add_safepoint() do_safepoint, safepointed); builder()->SetInsertPoint(do_safepoint); - call_vm(SharkRuntime::safepoint()); + call_vm(SharkRuntime::safepoint(), EX_CHECK_FULL); BasicBlock *safepointed_block = builder()->GetInsertBlock(); builder()->CreateBr(safepointed); @@ -504,7 +509,7 @@ void SharkTopLevelBlock::call_register_f do_call, done); builder()->SetInsertPoint(do_call); - call_vm(SharkRuntime::register_finalizer(), receiver); + call_vm(SharkRuntime::register_finalizer(), receiver, EX_CHECK_FULL); BasicBlock *branch_block = builder()->GetInsertBlock(); builder()->CreateBr(done); @@ -527,7 +532,7 @@ void SharkTopLevelBlock::handle_return(B // If we're returning with an exception then that exception // takes priority and the release_lock one will be ignored. while (num_monitors()) - release_lock(); + release_lock(EX_CHECK_NONE); // Reload the exception we're throwing if (exception) @@ -724,7 +729,7 @@ void SharkTopLevelBlock::do_athrow() { SharkValue *exception = pop(); check_null(exception); - handle_exception(exception->jobject_value()); + handle_exception(exception->jobject_value(), EX_CHECK_FULL); } void SharkTopLevelBlock::do_goto() @@ -1137,7 +1142,7 @@ void SharkTopLevelBlock::do_call() current_state()->cache_after_Java_call(method); // Check for pending exceptions - check_pending_exception(); + check_pending_exception(EX_CHECK_FULL); } void SharkTopLevelBlock::do_instance_check() @@ -1451,7 +1456,8 @@ void SharkTopLevelBlock::do_new() // The slow path call_vm( SharkRuntime::new_instance(), - LLVMValue::jint_constant(iter()->get_klass_index())); + LLVMValue::jint_constant(iter()->get_klass_index()), + EX_CHECK_FULL); slow_object = function()->CreateGetVMResult(); got_slow = builder()->GetInsertBlock(); @@ -1481,7 +1487,8 @@ void SharkTopLevelBlock::do_newarray() call_vm( SharkRuntime::newarray(), LLVMValue::jint_constant(type), - pop()->jint_value()); + pop()->jint_value(), + EX_CHECK_FULL); push(SharkValue::create_generic( ciArrayKlass::make(ciType::make(type)), @@ -1503,7 +1510,8 @@ void SharkTopLevelBlock::do_anewarray() call_vm( SharkRuntime::anewarray(), LLVMValue::jint_constant(iter()->get_klass_index()), - pop()->jint_value()); + pop()->jint_value(), + EX_CHECK_FULL); push(SharkValue::create_generic( array_klass, function()->CreateGetVMResult(), true)); @@ -1535,7 +1543,8 @@ void SharkTopLevelBlock::do_multianewarr SharkRuntime::multianewarray(), LLVMValue::jint_constant(iter()->get_klass_index()), LLVMValue::jint_constant(ndims), - builder()->CreateStructGEP(dimensions, 0)); + builder()->CreateStructGEP(dimensions, 0), + EX_CHECK_FULL); // Now we can pop the dimensions off the stack for (int i = 0; i < ndims; i++) @@ -1550,28 +1559,27 @@ void SharkTopLevelBlock::acquire_method_ iter()->force_bci(start()); // for the decache in acquire_lock if (target()->is_static()) { SharkConstantPool constants(this); - acquire_lock(constants.java_mirror()); + acquire_lock(constants.java_mirror(), EX_CHECK_NO_CATCH); } else { - acquire_lock(local(0)->jobject_value()); - } - check_pending_exception(false); + acquire_lock(local(0)->jobject_value(), EX_CHECK_NO_CATCH); + } } void SharkTopLevelBlock::do_monitorenter() { SharkValue *lockee = pop(); check_null(lockee); - acquire_lock(lockee->jobject_value()); + acquire_lock(lockee->jobject_value(), EX_CHECK_FULL); } void SharkTopLevelBlock::do_monitorexit() { pop(); // don't need this (monitors are block structured) - release_lock(); -} - -void SharkTopLevelBlock::acquire_lock(Value *lockee) + release_lock(EX_CHECK_FULL); +} + +void SharkTopLevelBlock::acquire_lock(Value *lockee, ExceptionAction ea) { BasicBlock *try_recursive = function()->CreateBlock("try_recursive"); BasicBlock *got_recursive = function()->CreateBlock("got_recursive"); @@ -1645,7 +1653,7 @@ void SharkTopLevelBlock::acquire_lock(Va // It's not a recursive case so we need to drop into the runtime builder()->SetInsertPoint(not_recursive); - call_vm_nocheck(SharkRuntime::monitorenter(), monitor_addr); + call_vm(SharkRuntime::monitorenter(), monitor_addr, ea); BasicBlock *acquired_slow = builder()->GetInsertBlock(); builder()->CreateBr(lock_acquired); @@ -1654,7 +1662,7 @@ void SharkTopLevelBlock::acquire_lock(Va current_state()->merge(fast_state, acquired_fast, acquired_slow); } -void SharkTopLevelBlock::release_lock() +void SharkTopLevelBlock::release_lock(ExceptionAction ea) { BasicBlock *not_recursive = function()->CreateBlock("not_recursive"); BasicBlock *released_fast = function()->CreateBlock("released_fast"); @@ -1697,7 +1705,7 @@ void SharkTopLevelBlock::release_lock() // Need to drop into the runtime to release this one builder()->SetInsertPoint(slow_path); - call_vm_nocheck(SharkRuntime::monitorexit(), monitor_addr); + call_vm(SharkRuntime::monitorexit(), monitor_addr, ea); BasicBlock *released_slow = builder()->GetInsertBlock(); builder()->CreateBr(lock_released); diff -r f78f8e38f872 -r fbb6b9fbb5a9 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Thu May 28 05:53:28 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Thu May 28 10:23:21 2009 -0400 @@ -236,98 +236,75 @@ class SharkTopLevelBlock : public SharkB int bci, SharkState* saved_state, llvm::BasicBlock* continue_block); + // Exceptions + enum ExceptionAction { + EX_CHECK_NONE, // don't check for pending exceptions + EX_CHECK_NO_CATCH, // if there is a pending exception then throw it + EX_CHECK_FULL // if there is a pending exception then catch it + }; // if it has a handler or throw it otherwise + void check_pending_exception(ExceptionAction action); + void handle_exception(llvm::Value* exception, ExceptionAction action); // VM calls private: - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee, - llvm::Value** args_start, - llvm::Value** args_end) + llvm::CallInst* call_vm(llvm::Constant* callee, + llvm::Value** args_start, + llvm::Value** args_end, + ExceptionAction ea) { current_state()->decache_for_VM_call(); function()->set_last_Java_frame(); llvm::CallInst *res = builder()->CreateCall(callee, args_start, args_end); function()->reset_last_Java_frame(); current_state()->cache_after_VM_call(); + if (ea != EX_CHECK_NONE) + check_pending_exception(ea); return res; } - llvm::CallInst* call_vm(llvm::Constant* callee, - llvm::Value** args_start, - llvm::Value** args_end) - { - llvm::CallInst* res = call_vm_nocheck(callee, args_start, args_end); - check_pending_exception(); - return res; - } - - public: - llvm::CallInst* call_vm(llvm::Constant* callee) + public: + llvm::CallInst* call_vm(llvm::Constant* callee, + ExceptionAction ea) { llvm::Value *args[] = {thread()}; - return call_vm(callee, args, args + 1); - } - llvm::CallInst* call_vm(llvm::Constant* callee, - llvm::Value* arg1) + return call_vm(callee, args, args + 1, ea); + } + llvm::CallInst* call_vm(llvm::Constant* callee, + llvm::Value* arg1, + ExceptionAction ea) { llvm::Value *args[] = {thread(), arg1}; - return call_vm(callee, args, args + 2); - } - llvm::CallInst* call_vm(llvm::Constant* callee, - llvm::Value* arg1, - llvm::Value* arg2) - { - llvm::Value *args[] = {thread(), arg1, arg2}; - return call_vm(callee, args, args + 3); + return call_vm(callee, args, args + 2, ea); } llvm::CallInst* call_vm(llvm::Constant* callee, llvm::Value* arg1, llvm::Value* arg2, - llvm::Value* arg3) + ExceptionAction ea) + { + llvm::Value *args[] = {thread(), arg1, arg2}; + return call_vm(callee, args, args + 3, ea); + } + llvm::CallInst* call_vm(llvm::Constant* callee, + llvm::Value* arg1, + llvm::Value* arg2, + llvm::Value* arg3, + ExceptionAction ea) { llvm::Value *args[] = {thread(), arg1, arg2, arg3}; - return call_vm(callee, args, args + 4); - } - - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee) - { - llvm::Value *args[] = {thread()}; - return call_vm_nocheck(callee, args, args + 1); - } - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee, - llvm::Value* arg1) - { - llvm::Value *args[] = {thread(), arg1}; - return call_vm_nocheck(callee, args, args + 2); - } - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee, - llvm::Value* arg1, - llvm::Value* arg2) - { - llvm::Value *args[] = {thread(), arg1, arg2}; - return call_vm_nocheck(callee, args, args + 3); - } - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee, - llvm::Value* arg1, - llvm::Value* arg2, - llvm::Value* arg3) - { - llvm::Value *args[] = {thread(), arg1, arg2, arg3}; - return call_vm_nocheck(callee, args, args + 4); + return call_vm(callee, args, args + 4, ea); } // Synchronization private: - void acquire_lock(llvm::Value* lockee); - void release_lock(); + void acquire_lock(llvm::Value* lockee, ExceptionAction ea); + void release_lock(ExceptionAction ea); public: void acquire_method_lock(); - // Error checking + // Bounds checks private: void check_bounds(SharkValue* array, SharkValue* index); - void check_pending_exception(bool attempt_catch = true); - void handle_exception(llvm::Value* exception, bool attempt_catch = true); // Safepoints private: From gbenson at redhat.com Thu May 28 07:41:58 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 28 May 2009 15:41:58 +0100 Subject: Shark exception processing improvements Message-ID: <20090528144158.GD3215@redhat.com> Hi all, When something in HotSpot throws an exception, it stores a pointer to the exception object in a slot in the current Java thread. There are various places in Shark where an exception can appear, and there are several different ways to handle them, and currently these behaviours are selected with boolean arguments that are not particularly self- documenting: check_pending_exception(true); What the hell does that mean? This commit replaces all these dodgy booleans with an enum with somewhat more meaningful values: enum ExceptionAction { EX_CHECK_NONE, // don't check for pending exceptions EX_CHECK_NO_CATCH, // if there is a pending exception then throw it EX_CHECK_FULL // if there is a pending exception then catch it }; // if it has a handler or throw it otherwise This allowed me to add exception handling to a bunch of methods that previously delegated it to their callers. This fixed a couple of bugs, namely that the monitorenter and monitorexit bytecodes did not check for exceptions, and the whole-method-synchronization thing always checked for exceptions, rather than only for the rare slow case. Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r f78f8e38f872 ChangeLog --- a/ChangeLog Thu May 28 05:53:28 2009 -0400 +++ b/ChangeLog Thu May 28 10:22:16 2009 -0400 @@ -1,3 +1,37 @@ +2009-05-28 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::ExceptionAction): New enum. + (SharkTopLevelBlock::check_pending_exception): Replace + boolean attempt_catch argument with an ExceptionAction. + (SharkTopLevelBlock::handle_exception): Likewise. + (SharkTopLevelBlock::call_vm): Add an ExceptionAction argument. + (SharkTopLevelBlock::acquire_lock): Likewise. + (SharkTopLevelBlock::release_lock): Likewise. + (SharkTopLevelBlock::call_vm_nocheck): Removed. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::check_pending_exception): Replace + boolean attempt_catch argument with an ExceptionAction. + (SharkTopLevelBlock::handle_exception): Likewise. + (SharkTopLevelBlock::call_vm): Add an ExceptionAction argument. + (SharkTopLevelBlock::acquire_lock): Likewise. + (SharkTopLevelBlock::release_lock): Likewise. + (SharkTopLevelBlock::zero_check_value): Updated. + (SharkTopLevelBlock::check_bounds): Likewise. + (SharkTopLevelBlock::add_safepoint): Likewise. + (SharkTopLevelBlock::call_register_finalizer): Likewise. + (SharkTopLevelBlock::handle_return): Likewise. + (SharkTopLevelBlock::do_athrow): Likewise. + (SharkTopLevelBlock::do_call): Likewise. + (SharkTopLevelBlock::do_new): Likewise. + (SharkTopLevelBlock::do_newarray): Likewise. + (SharkTopLevelBlock::do_anewarray): Likewise. + (SharkTopLevelBlock::do_multianewarray): Likewise. + (SharkTopLevelBlock::acquire_method_lock): Likewise. + (SharkTopLevelBlock::do_monitorenter): Likewise. + (SharkTopLevelBlock::do_monitorexit): Likewise. + 2009-05-28 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp diff -r f78f8e38f872 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu May 28 05:53:28 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu May 28 10:22:16 2009 -0400 @@ -294,15 +294,16 @@ builder()->SetInsertPoint(zero_block); if (value->is_jobject()) { - call_vm_nocheck( + call_vm( SharkRuntime::throw_NullPointerException(), builder()->pointer_constant(__FILE__), - LLVMValue::jint_constant(__LINE__)); + LLVMValue::jint_constant(__LINE__), + EX_CHECK_NONE); } else { builder()->CreateUnimplemented(__FILE__, __LINE__); } - handle_exception(function()->CreateGetPendingException()); + handle_exception(function()->CreateGetPendingException(), EX_CHECK_FULL); } void SharkTopLevelBlock::check_bounds(SharkValue* array, SharkValue* index) @@ -318,19 +319,22 @@ builder()->SetInsertPoint(out_of_bounds); SharkState *saved_state = current_state()->copy(); - call_vm_nocheck( + call_vm( SharkRuntime::throw_ArrayIndexOutOfBoundsException(), builder()->pointer_constant(__FILE__), LLVMValue::jint_constant(__LINE__), - index->jint_value()); - handle_exception(function()->CreateGetPendingException()); + index->jint_value(), + EX_CHECK_NONE); + handle_exception(function()->CreateGetPendingException(), EX_CHECK_FULL); set_current_state(saved_state); builder()->SetInsertPoint(in_bounds); } -void SharkTopLevelBlock::check_pending_exception(bool attempt_catch) +void SharkTopLevelBlock::check_pending_exception(ExceptionAction action) { + assert(action != EX_CHECK_NONE, "shouldn't be"); + BasicBlock *exception = function()->CreateBlock("exception"); BasicBlock *no_exception = function()->CreateBlock("no_exception"); @@ -345,15 +349,16 @@ builder()->SetInsertPoint(exception); builder()->CreateStore(LLVMValue::null(), pending_exception_addr); SharkState *saved_state = current_state()->copy(); - handle_exception(pending_exception, attempt_catch); + handle_exception(pending_exception, action); set_current_state(saved_state); builder()->SetInsertPoint(no_exception); } -void SharkTopLevelBlock::handle_exception(Value* exception, bool attempt_catch) +void SharkTopLevelBlock::handle_exception(Value* exception, + ExceptionAction action) { - if (attempt_catch && num_exceptions() != 0) { + if (action == EX_CHECK_FULL && num_exceptions() != 0) { // Clear the stack and push the exception onto it. // We do this now to protect it across the VM call // we may be about to make. @@ -392,11 +397,11 @@ LLVMValue::jint_constant(indexes[i]), builder()->CreateStructGEP(options, i)); - Value *index = call_vm_nocheck( + Value *index = call_vm( SharkRuntime::find_exception_handler(), builder()->CreateStructGEP(options, 0), - LLVMValue::jint_constant(num_options)); - check_pending_exception(false); + LLVMValue::jint_constant(num_options), + EX_CHECK_NO_CATCH); // Jump to the exception handler, if found BasicBlock *no_handler = function()->CreateBlock("no_handler"); @@ -451,7 +456,7 @@ do_safepoint, safepointed); builder()->SetInsertPoint(do_safepoint); - call_vm(SharkRuntime::safepoint()); + call_vm(SharkRuntime::safepoint(), EX_CHECK_FULL); BasicBlock *safepointed_block = builder()->GetInsertBlock(); builder()->CreateBr(safepointed); @@ -504,7 +509,7 @@ do_call, done); builder()->SetInsertPoint(do_call); - call_vm(SharkRuntime::register_finalizer(), receiver); + call_vm(SharkRuntime::register_finalizer(), receiver, EX_CHECK_FULL); BasicBlock *branch_block = builder()->GetInsertBlock(); builder()->CreateBr(done); @@ -527,7 +532,7 @@ // If we're returning with an exception then that exception // takes priority and the release_lock one will be ignored. while (num_monitors()) - release_lock(); + release_lock(EX_CHECK_NONE); // Reload the exception we're throwing if (exception) @@ -724,7 +729,7 @@ { SharkValue *exception = pop(); check_null(exception); - handle_exception(exception->jobject_value()); + handle_exception(exception->jobject_value(), EX_CHECK_FULL); } void SharkTopLevelBlock::do_goto() @@ -1137,7 +1142,7 @@ current_state()->cache_after_Java_call(method); // Check for pending exceptions - check_pending_exception(); + check_pending_exception(EX_CHECK_FULL); } void SharkTopLevelBlock::do_instance_check() @@ -1451,7 +1456,8 @@ // The slow path call_vm( SharkRuntime::new_instance(), - LLVMValue::jint_constant(iter()->get_klass_index())); + LLVMValue::jint_constant(iter()->get_klass_index()), + EX_CHECK_FULL); slow_object = function()->CreateGetVMResult(); got_slow = builder()->GetInsertBlock(); @@ -1481,7 +1487,8 @@ call_vm( SharkRuntime::newarray(), LLVMValue::jint_constant(type), - pop()->jint_value()); + pop()->jint_value(), + EX_CHECK_FULL); push(SharkValue::create_generic( ciArrayKlass::make(ciType::make(type)), @@ -1503,7 +1510,8 @@ call_vm( SharkRuntime::anewarray(), LLVMValue::jint_constant(iter()->get_klass_index()), - pop()->jint_value()); + pop()->jint_value(), + EX_CHECK_FULL); push(SharkValue::create_generic( array_klass, function()->CreateGetVMResult(), true)); @@ -1535,7 +1543,8 @@ SharkRuntime::multianewarray(), LLVMValue::jint_constant(iter()->get_klass_index()), LLVMValue::jint_constant(ndims), - builder()->CreateStructGEP(dimensions, 0)); + builder()->CreateStructGEP(dimensions, 0), + EX_CHECK_FULL); // Now we can pop the dimensions off the stack for (int i = 0; i < ndims; i++) @@ -1550,28 +1559,27 @@ iter()->force_bci(start()); // for the decache in acquire_lock if (target()->is_static()) { SharkConstantPool constants(this); - acquire_lock(constants.java_mirror()); + acquire_lock(constants.java_mirror(), EX_CHECK_NO_CATCH); } else { - acquire_lock(local(0)->jobject_value()); + acquire_lock(local(0)->jobject_value(), EX_CHECK_NO_CATCH); } - check_pending_exception(false); } void SharkTopLevelBlock::do_monitorenter() { SharkValue *lockee = pop(); check_null(lockee); - acquire_lock(lockee->jobject_value()); + acquire_lock(lockee->jobject_value(), EX_CHECK_FULL); } void SharkTopLevelBlock::do_monitorexit() { pop(); // don't need this (monitors are block structured) - release_lock(); + release_lock(EX_CHECK_FULL); } -void SharkTopLevelBlock::acquire_lock(Value *lockee) +void SharkTopLevelBlock::acquire_lock(Value *lockee, ExceptionAction ea) { BasicBlock *try_recursive = function()->CreateBlock("try_recursive"); BasicBlock *got_recursive = function()->CreateBlock("got_recursive"); @@ -1645,7 +1653,7 @@ // It's not a recursive case so we need to drop into the runtime builder()->SetInsertPoint(not_recursive); - call_vm_nocheck(SharkRuntime::monitorenter(), monitor_addr); + call_vm(SharkRuntime::monitorenter(), monitor_addr, ea); BasicBlock *acquired_slow = builder()->GetInsertBlock(); builder()->CreateBr(lock_acquired); @@ -1654,7 +1662,7 @@ current_state()->merge(fast_state, acquired_fast, acquired_slow); } -void SharkTopLevelBlock::release_lock() +void SharkTopLevelBlock::release_lock(ExceptionAction ea) { BasicBlock *not_recursive = function()->CreateBlock("not_recursive"); BasicBlock *released_fast = function()->CreateBlock("released_fast"); @@ -1697,7 +1705,7 @@ // Need to drop into the runtime to release this one builder()->SetInsertPoint(slow_path); - call_vm_nocheck(SharkRuntime::monitorexit(), monitor_addr); + call_vm(SharkRuntime::monitorexit(), monitor_addr, ea); BasicBlock *released_slow = builder()->GetInsertBlock(); builder()->CreateBr(lock_released); diff -r f78f8e38f872 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Thu May 28 05:53:28 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Thu May 28 10:22:16 2009 -0400 @@ -236,98 +236,75 @@ int bci, SharkState* saved_state, llvm::BasicBlock* continue_block); + // Exceptions + enum ExceptionAction { + EX_CHECK_NONE, // don't check for pending exceptions + EX_CHECK_NO_CATCH, // if there is a pending exception then throw it + EX_CHECK_FULL // if there is a pending exception then catch it + }; // if it has a handler or throw it otherwise + void check_pending_exception(ExceptionAction action); + void handle_exception(llvm::Value* exception, ExceptionAction action); // VM calls private: - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee, - llvm::Value** args_start, - llvm::Value** args_end) + llvm::CallInst* call_vm(llvm::Constant* callee, + llvm::Value** args_start, + llvm::Value** args_end, + ExceptionAction ea) { current_state()->decache_for_VM_call(); function()->set_last_Java_frame(); llvm::CallInst *res = builder()->CreateCall(callee, args_start, args_end); function()->reset_last_Java_frame(); current_state()->cache_after_VM_call(); - return res; - } - - llvm::CallInst* call_vm(llvm::Constant* callee, - llvm::Value** args_start, - llvm::Value** args_end) - { - llvm::CallInst* res = call_vm_nocheck(callee, args_start, args_end); - check_pending_exception(); + if (ea != EX_CHECK_NONE) + check_pending_exception(ea); return res; } public: - llvm::CallInst* call_vm(llvm::Constant* callee) + llvm::CallInst* call_vm(llvm::Constant* callee, + ExceptionAction ea) { llvm::Value *args[] = {thread()}; - return call_vm(callee, args, args + 1); - } - llvm::CallInst* call_vm(llvm::Constant* callee, - llvm::Value* arg1) - { - llvm::Value *args[] = {thread(), arg1}; - return call_vm(callee, args, args + 2); + return call_vm(callee, args, args + 1, ea); } llvm::CallInst* call_vm(llvm::Constant* callee, llvm::Value* arg1, - llvm::Value* arg2) + ExceptionAction ea) { - llvm::Value *args[] = {thread(), arg1, arg2}; - return call_vm(callee, args, args + 3); + llvm::Value *args[] = {thread(), arg1}; + return call_vm(callee, args, args + 2, ea); } llvm::CallInst* call_vm(llvm::Constant* callee, llvm::Value* arg1, llvm::Value* arg2, - llvm::Value* arg3) + ExceptionAction ea) + { + llvm::Value *args[] = {thread(), arg1, arg2}; + return call_vm(callee, args, args + 3, ea); + } + llvm::CallInst* call_vm(llvm::Constant* callee, + llvm::Value* arg1, + llvm::Value* arg2, + llvm::Value* arg3, + ExceptionAction ea) { llvm::Value *args[] = {thread(), arg1, arg2, arg3}; - return call_vm(callee, args, args + 4); - } - - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee) - { - llvm::Value *args[] = {thread()}; - return call_vm_nocheck(callee, args, args + 1); - } - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee, - llvm::Value* arg1) - { - llvm::Value *args[] = {thread(), arg1}; - return call_vm_nocheck(callee, args, args + 2); - } - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee, - llvm::Value* arg1, - llvm::Value* arg2) - { - llvm::Value *args[] = {thread(), arg1, arg2}; - return call_vm_nocheck(callee, args, args + 3); - } - llvm::CallInst* call_vm_nocheck(llvm::Constant* callee, - llvm::Value* arg1, - llvm::Value* arg2, - llvm::Value* arg3) - { - llvm::Value *args[] = {thread(), arg1, arg2, arg3}; - return call_vm_nocheck(callee, args, args + 4); + return call_vm(callee, args, args + 4, ea); } // Synchronization private: - void acquire_lock(llvm::Value* lockee); - void release_lock(); + void acquire_lock(llvm::Value* lockee, ExceptionAction ea); + void release_lock(ExceptionAction ea); public: void acquire_method_lock(); - // Error checking + // Bounds checks private: void check_bounds(SharkValue* array, SharkValue* index); - void check_pending_exception(bool attempt_catch = true); - void handle_exception(llvm::Value* exception, bool attempt_catch = true); // Safepoints private: From langel at redhat.com Thu May 28 08:39:15 2009 From: langel at redhat.com (Lillian Angel) Date: Thu, 28 May 2009 11:39:15 -0400 Subject: IcedTea6-1.5 Release Testing Message-ID: <4A1EB023.7010805@redhat.com> Hi, We have pretty much completed our testing for the IcedTea6-1.5 release (http://icedtea.classpath.org/hg/release/icedtea6-1.5) on x86, x86_64, ppc and ppc64. Before we go ahead with the final release, I am wondering where everyone else stands with their testing, and if there are any known show stoppers. Please post your concerns to the list. Cheers, Lillian From doko at ubuntu.com Thu May 28 08:47:01 2009 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 28 May 2009 17:47:01 +0200 Subject: IcedTea6-1.5 Release Testing In-Reply-To: <4A1EB023.7010805@redhat.com> References: <4A1EB023.7010805@redhat.com> Message-ID: <4A1EB1F5.1070101@ubuntu.com> Lillian Angel schrieb: > Hi, > > We have pretty much completed our testing for the IcedTea6-1.5 release > (http://icedtea.classpath.org/hg/release/icedtea6-1.5) on x86, x86_64, > ppc and ppc64. Before we go ahead with the final release, I am wondering > where everyone else stands with their testing, and if there are any > known show stoppers. I won't have the time now, and next week is J1. But the RC2 builds for the slower ports did complete, and test results look ok for s390, ia64, sparc, armel. even mipsel test results look good. mips didn't finish yet. The test summaries are part of the build logs at https://buildd.debian.org/build.php?arch=&pkg=openjdk-6 (the s390 build did succeed on another machine, the mips was restarted). Matthias From gbenson at redhat.com Thu May 28 08:55:08 2009 From: gbenson at redhat.com (Gary Benson) Date: Thu, 28 May 2009 15:55:08 +0000 Subject: changeset in /hg/icedtea6: 2009-05-28 Gary Benson changeset 797d59eaba38 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=797d59eaba38 description: 2009-05-28 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::do_return): Always call add_safepoint. diffstat: 2 files changed, 7 insertions(+), 3 deletions(-) ChangeLog | 7 ++++++- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 3 +-- diffs (34 lines): diff -r fbb6b9fbb5a9 -r 797d59eaba38 ChangeLog --- a/ChangeLog Thu May 28 10:23:21 2009 -0400 +++ b/ChangeLog Thu May 28 16:56:19 2009 +0100 @@ -1,3 +1,8 @@ 2009-05-28 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::do_return): Always call add_safepoint. + 2009-05-28 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp @@ -10,7 +15,7 @@ 2009-05-28 Gary Benson intrinsic_id() == vmIntrinsics::_Object_init) call_register_finalizer(local(0)->jobject_value()); - else - add_safepoint(); + add_safepoint(); handle_return(type, NULL); } From gnu_andrew at member.fsf.org Thu May 28 11:04:57 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 28 May 2009 19:04:57 +0100 Subject: OpenJDK7 and the JavaOne preview (M3) release In-Reply-To: <194f62550905280444i1bc28539j57d0f0800b70ee8b@mail.gmail.com> References: <17c6771e0905080454i51afcf0bn2d731ab657d58c9d@mail.gmail.com> <17c6771e0905221035y824ad5fla5a140831c4f0b92@mail.gmail.com> <1243015508.3655.123.camel@hermans.wildebeest.org> <1243063124.3579.19.camel@hermans.wildebeest.org> <1243205284.30320.15.camel@hermans.wildebeest.org> <17c6771e0905260135t59013f4dwc7ad25dea9520d28@mail.gmail.com> <17c6771e0905260137m15adc51j8c59f4c9494374d1@mail.gmail.com> <1243329380.20462.14.camel@hermans.wildebeest.org> <17c6771e0905260308s14a81f8es18592db5294a6cda@mail.gmail.com> <194f62550905280444i1bc28539j57d0f0800b70ee8b@mail.gmail.com> Message-ID: <17c6771e0905281104o138ad277j25d0f8184d8a2e14@mail.gmail.com> 2009/5/28 Clemens Eisserer : > Hi, > > Sorry for causing problems and additional work, and thanks for fixing > the issues. > >> Yes, but my point was we wouldn't have run into this issues if >> upstream was keeping pace with jdk7 development. ?We have to be >> careful which projects we import if we're going to end up maintaining >> them over successive jdk7 releases, which happen on a weekly basis. >> >> Clemens, can you look into incorporating Mark's changes upstream? > Yes, I'll do that. > > Soon I'll replace the current code with the rewrite version, hope it > won't be a lot of work integrating it. > > Thanks, Clemens > Thanks. Just holler if we can be of any help with hg and stuff. I think it'd be much easier for us working on IcedTea7 to just pull your changesets straight into our IcedTea forest than maintain a crazy bunch of patches. -- 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 May 28 11:10:00 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 May 2009 18:10:00 +0000 Subject: [Bug 339] icedtea7 20090527 fails to run the langtools and jdk testsuite Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=339 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #12 from gnu_andrew at member.fsf.org 2009-05-28 18:09 ------- Fixed: http://hg.openjdk.java.net/nio/nio/jdk/rev/df307ca8f332 http://hg.openjdk.java.net/icedtea/jdk7/jdk/rev/3d024b86523a Or should be anyway. doko, please reopen if not. -- 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 May 28 11:10:20 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 May 2009 18:10:20 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |ASSIGNED ------- Comment #7 from gnu_andrew at member.fsf.org 2009-05-28 18:10 ------- Looks unique to Debian/Ubuntu. Just replicated this on a Debian build. -- 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 May 28 11:12:50 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 28 May 2009 19:12:50 +0100 Subject: IcedTea7 1.10 Release Status Message-ID: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> I've built most permutations I can think of. What's left to my mind is: * Check a cacao build works (this is the only one I've not done so far) * Fix http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 - narrowed this down to being a Debian/Ubuntu bug * Get the ok on the plugin/javaws from Deepak Once these are ok, I plan to cut a release. Any objections? -- 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 May 28 11:26:51 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 May 2009 18:26:51 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 ------- Comment #8 from gnu_andrew at member.fsf.org 2009-05-28 18:26 ------- I was pretty sure from the start that this patch in openjdk-ecj was the offender: + but I didn't read it carefully. It was working on other systems so I assume it was right. For some reason, on Fedora and Gentoo's ant, the tools.jar file is not needed (different VM being used or something?). The path to it should of course be lib/tools.jar not jre/lib/tools.jar. Fixing that makes it build for me on Debian. -- 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 ahughes at redhat.com Thu May 28 11:30:55 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 28 May 2009 18:30:55 +0000 Subject: changeset in /hg/icedtea: Incorporate fix for PR339. Message-ID: changeset c1ca56ce26f5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c1ca56ce26f5 description: Incorporate fix for PR339. 2009-05-27 Andrew John Hughes * Makefile.am: Bump changeset to include NIO2 fix (/etc/mtab --> /proc/mounts). See PR339. diffstat: 2 files changed, 9 insertions(+), 2 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 4 ++-- diffs (35 lines): diff -r 31b0ba36a6b7 -r c1ca56ce26f5 ChangeLog --- a/ChangeLog Thu May 28 10:18:19 2009 +0100 +++ b/ChangeLog Thu May 28 15:06:49 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-27 Andrew John Hughes + + * Makefile.am: + Bump changeset to include NIO2 fix + (/etc/mtab --> /proc/mounts). + See PR339. + 2009-05-27 Andrew John Hughes * overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java, diff -r 31b0ba36a6b7 -r c1ca56ce26f5 Makefile.am --- a/Makefile.am Thu May 28 10:18:19 2009 +0100 +++ b/Makefile.am Thu May 28 15:06:49 2009 +0100 @@ -4,7 +4,7 @@ CORBA_CHANGESET = e9ba2b962ddf CORBA_CHANGESET = e9ba2b962ddf JAXP_CHANGESET = 748976d69503 JAXWS_CHANGESET = faac46e2e60f -JDK_CHANGESET = 567b20871c5d +JDK_CHANGESET = 3d024b86523a LANGTOOLS_CHANGESET = 0f653be1a42f HOTSPOT_CHANGESET = aa0c48844632 @@ -12,7 +12,7 @@ CORBA_MD5SUM = 13b64a402845a469cae31e04f CORBA_MD5SUM = 13b64a402845a469cae31e04ffc5ee80 JAXP_MD5SUM = 18c922319545d7e907a2d6cbb265865d JAXWS_MD5SUM = b2c0a779e349f82427a78485ef53321b -JDK_MD5SUM = cdd6f2d448f65e92a4349e2f83873278 +JDK_MD5SUM = 16f6bbc35c99de1996b545b6b500f668 LANGTOOLS_MD5SUM = ccad721f71ab49a61bbf684039b4d55d HOTSPOT_MD5SUM = c40c25a481a1c33ac15a89812a0b9f8c From ahughes at redhat.com Thu May 28 11:30:55 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 28 May 2009 18:30:55 +0000 Subject: changeset in /hg/icedtea: Search java-icedtea last, as it's the ... Message-ID: changeset a1476b6655c1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a1476b6655c1 description: Search java-icedtea last, as it's the worst choice (old 1.7 on Fedora). 2009-05-27 Andrew John Hughes * acinclude.m4: Search java-icedtea last not first. It's from the old 1.7 packages on Fedora (and can be empty), so should be our last choice. diffstat: 2 files changed, 13 insertions(+), 6 deletions(-) ChangeLog | 7 +++++++ acinclude.m4 | 12 ++++++------ diffs (43 lines): diff -r c1ca56ce26f5 -r a1476b6655c1 ChangeLog --- a/ChangeLog Thu May 28 15:06:49 2009 +0100 +++ b/ChangeLog Thu May 28 19:31:50 2009 +0100 @@ -1,3 +1,10 @@ 2009-05-27 Andrew John Hughes + + * acinclude.m4: + Search java-icedtea last not first. It's + from the old 1.7 packages on Fedora (and can + be empty), so should be our last choice. + 2009-05-27 Andrew John Hughes * Makefile.am: diff -r c1ca56ce26f5 -r a1476b6655c1 acinclude.m4 --- a/acinclude.m4 Thu May 28 15:06:49 2009 +0100 +++ b/acinclude.m4 Thu May 28 19:31:50 2009 +0100 @@ -1213,9 +1213,9 @@ AC_DEFUN([AC_CHECK_FOR_OPENJDK], SYSTEM_OPENJDK_DIR= ]) if test -z "${SYSTEM_OPENJDK_DIR}"; then - for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \ - /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ - /usr/lib/jvm/openjdk; do + for dir in /usr/lib/jvm/java-openjdk /usr/lib/jvm/icedtea6 \ + /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/openjdk \ + /usr/lib/jvm/java-icedtea; do if test -d $dir; then SYSTEM_OPENJDK_DIR=$dir break @@ -1251,9 +1251,9 @@ AC_DEFUN([AC_CHECK_FOR_ICEDTEA], SYSTEM_ICEDTEA_DIR= ]) if test -z "${SYSTEM_ICEDTEA_DIR}"; then - for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \ - /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ - /usr/lib/jvm/openjdk; do + for dir in /usr/lib/jvm/java-openjdk /usr/lib/jvm/icedtea6 \ + /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/openjdk \ + /usr/lib/jvm/java-icedtea; do if test -d $dir; then SYSTEM_ICEDTEA_DIR=$dir break From ahughes at redhat.com Thu May 28 11:30:56 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 28 May 2009 18:30:56 +0000 Subject: changeset in /hg/icedtea: Fix PR338: path to tools.jar was wrong... Message-ID: changeset 331c91ed45cd in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=331c91ed45cd description: Fix PR338: path to tools.jar was wrong, but only hurts Debian/Ubuntu users. 2009-05-27 Andrew John Hughes * patches/ecj/icedtea.patch: Fix for PR338. The path to tools.jar was wrong in the jaxws patch (jre/lib/tools.jar rather than lib/tools.jar). For some reason, only Debian/Ubuntu users get hit by this. diffstat: 2 files changed, 9 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ patches/ecj/icedtea.patch | 2 +- diffs (27 lines): diff -r a1476b6655c1 -r 331c91ed45cd ChangeLog --- a/ChangeLog Thu May 28 19:31:50 2009 +0100 +++ b/ChangeLog Thu May 28 19:33:39 2009 +0100 @@ -1,3 +1,11 @@ 2009-05-27 Andrew John Hughes + + * patches/ecj/icedtea.patch: + Fix for PR338. The path to tools.jar was + wrong in the jaxws patch (jre/lib/tools.jar + rather than lib/tools.jar). For some reason, + only Debian/Ubuntu users get hit by this. + 2009-05-27 Andrew John Hughes * acinclude.m4: diff -r a1476b6655c1 -r 331c91ed45cd patches/ecj/icedtea.patch --- a/patches/ecj/icedtea.patch Thu May 28 19:31:50 2009 +0100 +++ b/patches/ecj/icedtea.patch Thu May 28 19:33:39 2009 +0100 @@ -329,7 +329,7 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu - excludes="com/sun/tools/internal/txw2/**"> + excludes="com/sun/tools/internal/txw2/**" + source="1.5"> -+ ++ From bugzilla-daemon at icedtea.classpath.org Thu May 28 11:33:05 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 May 2009 18:33:05 +0000 Subject: [Bug 338] icedtea7 20090527 fails to build using gcj Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution| |FIXED ------- Comment #9 from gnu_andrew at member.fsf.org 2009-05-28 18:33 ------- Fixed: http://icedtea.classpath.org/hg/icedtea/rev/331c91ed45cd -- 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 May 28 13:07:02 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 28 May 2009 21:07:02 +0100 Subject: IcedTea7 1.10 Release Status In-Reply-To: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> Message-ID: <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> 2009/5/28 Andrew John Hughes : > I've built most permutations I can think of. ?What's left to my mind is: > > * Check a cacao build works (this is the only one I've not done so far) > * Fix http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 - > narrowed this down to being a Debian/Ubuntu bug > * Get the ok on the plugin/javaws from Deepak > > Once these are ok, I plan to cut a release. ?Any objections? > -- > 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 > PR338 fixed and Deepak reports that the plugin is now working. CACAO seems to have broken since 1.9: LOG: [0x00002af94c0f01e0] We received a SIGSEGV and tried to handle it, but we were LOG: [0x00002af94c0f01e0] unable to find a Java method at: LOG: [0x00002af94c0f01e0] LOG: [0x00002af94c0f01e0] PC=0x00002af94c1526b1 LOG: [0x00002af94c0f01e0] LOG: [0x00002af94c0f01e0] Dumping the current stacktrace: at java.lang.String.()V(String.java:1218) LOG: [0x00002af94c0f01e0] Exiting... Anyone have any ideas? -- 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 mark at klomp.org Fri May 29 00:52:27 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 29 May 2009 09:52:27 +0200 Subject: IcedTea7 1.10 Release Status In-Reply-To: <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> Message-ID: <1243583547.4800.18.camel@hermans.wildebeest.org> Hi Andrew, On Thu, 2009-05-28 at 21:07 +0100, Andrew John Hughes wrote: > CACAO seems to have broken since 1.9: > > LOG: [0x00002af94c0f01e0] We received a SIGSEGV and tried to handle > it, but we were > LOG: [0x00002af94c0f01e0] unable to find a Java method at: > LOG: [0x00002af94c0f01e0] > LOG: [0x00002af94c0f01e0] PC=0x00002af94c1526b1 > LOG: [0x00002af94c0f01e0] > LOG: [0x00002af94c0f01e0] Dumping the current stacktrace: > at java.lang.String.()V(String.java:1218) > LOG: [0x00002af94c0f01e0] Exiting... > > Anyone have any ideas? I am not seeing that failure, but I am seeing: LOG: [0xb7f346c0] system_mmap_anonymous: mmap failed: Permission denied Which seems to be caused by the icedtea-cacao-no-mmap-first-page.patch not being applied. The icedtea6 --enable-cacao build seems to go fine. Cheers, Mark From doko at ubuntu.com Fri May 29 01:11:50 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Fri, 29 May 2009 08:11:50 +0000 Subject: changeset in /hg/icedtea: 2009-05-29 Matthias Klose changeset 166d329b827d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=166d329b827d description: 2009-05-29 Matthias Klose * patches/icedtea-cacao-no-mmap-first-page.patch: New. * Makefile.am (ICEDTEA_PATCHES): Apply above patch. * HACKING: Update. diffstat: 4 files changed, 32 insertions(+), 1 deletion(-) ChangeLog | 6 ++++++ HACKING | 1 + Makefile.am | 3 ++- patches/cacao/no-mmap-first-page.patch | 23 +++++++++++++++++++++++ diffs (64 lines): diff -r 331c91ed45cd -r 166d329b827d ChangeLog --- a/ChangeLog Thu May 28 19:33:39 2009 +0100 +++ b/ChangeLog Fri May 29 10:07:12 2009 +0200 @@ -1,3 +1,9 @@ 2009-05-27 Andrew John Hughes + + * patches/icedtea-cacao-no-mmap-first-page.patch: New. + * Makefile.am (ICEDTEA_PATCHES): Apply above patch. + * HACKING: Update. + 2009-05-27 Andrew John Hughes * patches/ecj/icedtea.patch: diff -r 331c91ed45cd -r 166d329b827d HACKING --- a/HACKING Thu May 28 19:33:39 2009 +0100 +++ b/HACKING Fri May 29 10:07:12 2009 +0200 @@ -72,6 +72,7 @@ The following patches are currently appl * icedtea-includedb.patch: Add missing include files. (S6793825, mostly applied in b47) * icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295). * cacao/launcher.patch: For the 'java' command, create new thread depending on the current VM. +* icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page. The following patches are only applied to OpenJDK6 in IcedTea6: diff -r 331c91ed45cd -r 166d329b827d Makefile.am --- a/Makefile.am Thu May 28 19:33:39 2009 +0100 +++ b/Makefile.am Fri May 29 10:07:12 2009 +0200 @@ -2084,7 +2084,8 @@ endif if BUILD_CACAO ICEDTEA_PATCHES += \ - patches/cacao/launcher.patch + patches/cacao/launcher.patch \ + patches/cacao/no-mmap-first-page.patch endif if WITH_CACAO diff -r 331c91ed45cd -r 166d329b827d patches/cacao/no-mmap-first-page.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/no-mmap-first-page.patch Fri May 29 10:07:12 2009 +0200 @@ -0,0 +1,23 @@ +--- cacao/cacao/src/vm/jit/trap.c.orig 2008-07-07 13:36:19.000000000 +0200 ++++ cacao/cacao/src/vm/jit/trap.c 2008-07-23 10:45:30.480113152 +0200 +@@ -59,20 +59,6 @@ + */ + void trap_init(void) + { +-#if !(defined(__ARM__) && defined(__LINUX__)) +- /* On arm-linux the first memory page can't be mmap'ed, as it +- contains the exception vectors. */ +- +- int pagesize; +- +- /* mmap a memory page at address 0x0, so our hardware-exceptions +- work. */ +- +- pagesize = system_getpagesize(); +- +- (void) system_mmap_anonymous(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED); +-#endif +- + TRACESUBSYSTEMINITIALIZATION("trap_init"); + + #if !defined(TRAP_INSTRUCTION_IS_LOAD) From doko at ubuntu.com Fri May 29 01:13:51 2009 From: doko at ubuntu.com (doko at ubuntu.com) Date: Fri, 29 May 2009 08:13:51 +0000 Subject: changeset in /hg/icedtea: 2009-05-29 Matthias Klose changeset b65dc786ec65 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b65dc786ec65 description: 2009-05-29 Matthias Klose * patches/icedtea-fonts.patch: Update fontconfig for Ubuntu. diffstat: 2 files changed, 386 insertions(+) ChangeLog | 4 patches/icedtea-fonts.patch | 382 +++++++++++++++++++++++++++++++++++++++++++ diffs (400 lines): diff -r 166d329b827d -r b65dc786ec65 ChangeLog --- a/ChangeLog Fri May 29 10:07:12 2009 +0200 +++ b/ChangeLog Fri May 29 10:09:16 2009 +0200 @@ -1,3 +1,7 @@ 2009-05-29 Matthias Klose + + * patches/icedtea-fonts.patch: Update fontconfig for Ubuntu. + 2009-05-29 Matthias Klose * patches/icedtea-cacao-no-mmap-first-page.patch: New. diff -r 166d329b827d -r b65dc786ec65 patches/icedtea-fonts.patch --- a/patches/icedtea-fonts.patch Fri May 29 10:07:12 2009 +0200 +++ b/patches/icedtea-fonts.patch Fri May 29 10:09:16 2009 +0200 @@ -399,3 +399,385 @@ +filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf +filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf + +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig 2009-05-05 15:35:28.000000000 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-05 15:36:52.000000000 +0000 +@@ -25,106 +25,253 @@ + + # Version + +-# Uses Ubuntu 6.10 (Edgy) fonts and file paths. ++# Uses Ubuntu 8.04 (hardy) (and more recent releases) fonts and file paths. + version=1 + + # Component Font Mappings + +-dialog.plain.latin-1=DejaVu Sans +-dialog.plain.japanese-x0208=Kochi Gothic +-dialog.plain.korean=Baekmuk Dotum ++# Chinese fonts ++allfonts.umingcn=AR PL UMing CN ++#allfonts.umingcn.motif=AR PL UMing CN ++allfonts.uminghk=AR PL UMing HK ++#allfonts.uminghk.motif=AR PL UMing HK ++allfonts.umingtw=AR PL UMing TW ++#allfonts.umingtw.motif=AR PL UMing TW ++allfonts.wqy-zenhei=WenQuanYi Zen Hei ++#allfonts.wqy-zenhei.motif=WenQuanYi Zen Hei ++allfonts.shanheisun=AR PL ShanHeiSun Uni ++#allfonts.shanheisun.motif=AR PL ShanHeiSun Uni ++ ++# Indic scripts ++allfonts.bengali=Lohit Bengali ++allfonts.gujarati=Lohit Gujarati ++allfonts.hindi=Lohit Hindi ++#allfonts.malayalam=Lohit Malayalam ++allfonts.oriya=Lohit Oriya ++allfonts.punjabi=Lohit Punjabi ++allfonts.tamil=Lohit Tamil ++allfonts.telugu=Lohit Telugu ++allfonts.sinhala=LKLUG + +-dialog.bold.latin-1=DejaVu Sans Bold +-dialog.bold.japanese-x0208=Kochi Gothic +-dialog.bold.korean=Baekmuk Dotum + +-dialog.italic.latin-1=DejaVu Sans Oblique +-dialog.italic.japanese-x0208=Kochi Gothic +-dialog.italic.korean=Baekmuk Dotum ++serif.plain.latin-1=DejaVu Serif ++#serif.plain.latin-1.motif=LuxiSerif-Regular ++serif.plain.japanese-kochi=Kochi Mincho ++serif.plain.japanese-sazanami=Sazanami Mincho ++serif.plain.japanese-vlgothic=Kochi Mincho ++serif.plain.korean-baekmuk=Baekmuk Batang ++#serif.plain.korean-baekmuk.motif=Baekmuk Batang ++serif.plain.korean-un=UnBatang ++#serif.plain.korean-un.motif=UnBatang + +-dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique +-dialog.bolditalic.japanese-x0208=Kochi Gothic +-dialog.bolditalic.korean=Baekmuk Dotum ++serif.bold.latin-1=DejaVu Serif Bold ++#serif.bold.latin-1.motif=LuxiSerif-Bold ++serif.bold.japanese-kochi=Kochi Mincho ++serif.bold.japanese-sazanami=Sazanami Mincho ++serif.bold.japanese-vlgothic=Kochi Mincho ++serif.bold.korean-baekmuk=Baekmuk Batang ++#serif.bold.korean-baekmuk.motif=Baekmuk Batang ++serif.bold.korean-un=UnBatang Bold ++#serif.bold.korean-un.motif=UnBatang Bold ++ ++serif.italic.latin-1=DejaVu Serif Oblique ++#serif.italic.latin-1.motif=LuxiSerif-Oblique ++serif.italic.japanese-kochi=Kochi Mincho ++serif.italic.japanese-sazanami=Sazanami Mincho ++serif.italic.japanese-vlgothic=Kochi Mincho ++serif.italic.korean-baekmuk=Baekmuk Batang ++#serif.italic.korean-baekmuk.motif=Baekmuk Batang ++serif.italic.korean-un=UnBatang ++#serif.italic.korean-un.motif=UnBatang + ++serif.bolditalic.latin-1=DejaVu Serif Bold Oblique ++#serif.bolditalic.latin-1.motif=LuxiSerif-BoldOblique ++serif.bolditalic.japanese-kochi=Kochi Mincho ++serif.bolditalic.japanese-sazanami=Sazanami Mincho ++serif.bolditalic.japanese-vlgothic=Kochi Mincho ++serif.bolditalic.korean-baekmuk=Baekmuk Batang ++#serif.bolditalic.korean-baekmuk.motif=Baekmuk Batang ++serif.bolditalic.korean-un=UnBatang Bold ++#serif.bolditalic.korean-un.motif=UnBatang Bold + + sansserif.plain.latin-1=DejaVu Sans +-sansserif.plain.japanese-x0208=Kochi Gothic +-sansserif.plain.korean=Baekmuk Dotum ++#sansserif.plain.latin-1.motif=LuxiSans-Regular ++sansserif.plain.japanese-kochi=Kochi Gothic ++sansserif.plain.japanese-sazanami=Sazanami Gothic ++sansserif.plain.japanese-vlgothic=VL PGothic ++sansserif.plain.korean-baekmuk=Baekmuk Gulim ++#sansserif.plain.korean-baekmuk.motif=Baekmuk Gulim ++sansserif.plain.korean-un=UnDotum ++#sansserif.plain.korean-un.motif=UnDotum + + sansserif.bold.latin-1=DejaVu Sans Bold +-sansserif.bold.japanese-x0208=Kochi Gothic +-sansserif.bold.korean=Baekmuk Dotum ++#sansserif.bold.latin-1.motif=LuxiSans-Bold ++sansserif.bold.japanese-kochi=Kochi Gothic ++sansserif.bold.japanese-sazanami=Sazanami Gothic ++sansserif.bold.japanese-vlgothic=VL PGothic ++sansserif.bold.korean-baekmuk=Baekmuk Gulim ++#sansserif.bold.korean-baekmuk.motif=Baekmuk Gulim ++sansserif.bold.korean-un=UnDotum Bold ++#sansserif.bold.korean-un.motif=UnDotum Bold + + sansserif.italic.latin-1=DejaVu Sans Oblique +-sansserif.italic.japanese-x0208=Kochi Gothic +-sansserif.italic.korean=Baekmuk Dotum ++#sansserif.italic.latin-1.motif=LuxiSans-Oblique ++sansserif.italic.japanese-kochi=Kochi Gothic ++sansserif.italic.japanese-sazanami=Sazanami Gothic ++sansserif.italic.japanese-vlgothic=VL PGothic ++sansserif.italic.korean-baekmuk=Baekmuk Gulim ++#sansserif.italic.korean-baekmuk.motif=Baekmuk Gulim ++sansserif.italic.korean-un=UnDotum ++#sansserif.italic.korean-un.motif=UnDotum + + sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique +-sansserif.bolditalic.japanese-x0208=Kochi Gothic +-sansserif.bolditalic.korean=Baekmuk Dotum +- +- +-serif.plain.latin-1=DejaVu Serif +-serif.plain.japanese-x0208=Kochi Mincho +-serif.plain.korean=Baekmuk Batang +- +-serif.bold.latin-1=DejaVu Serif Bold +-serif.bold.japanese-x0208=Kochi Mincho +-serif.bold.korean=Baekmuk Batang +- +-serif.italic.latin-1=DejaVu Serif Oblique +-serif.italic.japanese-x0208=Kochi Mincho +-serif.italic.korean=Baekmuk Batang +- +-serif.bolditalic.latin-1=DejaVu Serif Bold Oblique +-serif.bolditalic.japanese-x0208=Kochi Mincho +-serif.bolditalic.korean=Baekmuk Batang +- ++#sansserif.bolditalic.latin-1.motif=LuxiSans-BoldOblique ++sansserif.bolditalic.japanese-kochi=Kochi Gothic ++sansserif.bolditalic.japanese-sazanami=Sazanami Gothic ++sansserif.bolditalic.japanese-vlgothic=VL PGothic ++sansserif.bolditalic.korean-baekmuk=Baekmuk Gulim ++#sansserif.bolditalic.korean-baekmuk.motif=Baekmuk Gulim ++sansserif.bolditalic.korean-un=UnDotum Bold ++#sansserif.bolditalic.korean-un.motif=UnDotum Bold + + monospaced.plain.latin-1=DejaVu Sans Mono +-monospaced.plain.japanese-x0208=Kochi Gothic +-monospaced.plain.korean=Baekmuk Dotum ++#monospaced.plain.latin-1.motif=LuxiMono-Regular ++monospaced.plain.japanese-kochi=Kochi Gothic ++monospaced.plain.japanese-sazanami=Sazanami Gothic ++monospaced.plain.japanese-vlgothic=VL Gothic ++monospaced.plain.korean-baekmuk=Baekmuk Gulim ++#monospaced.plain.korean-baekmuk.motif=Baekmuk Gulim ++monospaced.plain.korean-un=UnDotum ++#monospaced.plain.korean-un.motif=UnDotum + + monospaced.bold.latin-1=DejaVu Sans Mono Bold +-monospaced.bold.japanese-x0208=Kochi Gothic +-monospaced.bold.korean=Baekmuk Dotum ++#monospaced.bold.latin-1.motif=LuxiMono-Bold ++monospaced.bold.japanese-kochi=Kochi Gothic ++monospaced.bold.japanese-sazanami=Sazanami Gothic ++monospaced.bold.japanese-vlgothic=VL Gothic ++monospaced.bold.korean-baekmuk=Baekmuk Gulim ++#monospaced.bold.korean-baekmuk.motif=Baekmuk Gulim ++monospaced.bold.korean-un=UnDotum Bold ++#monospaced.bold.korean-un.motif=UnDotum Bold + + monospaced.italic.latin-1=DejaVu Sans Mono Oblique +-monospaced.italic.japanese-x0208=Kochi Gothic +-monospaced.italic.korean=Baekmuk Dotum ++#monospaced.italic.latin-1.motif=LuxiMono-Oblique ++monospaced.italic.japanese-kochi=Kochi Gothic ++monospaced.italic.japanese-sazanami=Sazanami Gothic ++monospaced.italic.japanese-vlgothic=VL Gothic ++monospaced.italic.korean-baekmuk=Baekmuk Gulim ++#monospaced.italic.korean-baekmuk.motif=Baekmuk Gulim ++monospaced.italic.korean-un=UnDotum ++#monospaced.italic.korean-un.motif=UnDotum + + monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique +-monospaced.bolditalic.japanese-x0208=Kochi Gothic +-monospaced.bolditalic.korean=Baekmuk Dotum ++#monospaced.bolditalic.latin-1.motif=LuxiMono-BoldOblique ++monospaced.bolditalic.japanese-kochi=Kochi Gothic ++monospaced.bolditalic.japanese-sazanami=Sazanami Gothic ++monospaced.bolditalic.japanese-vlgothic=VL Gothic ++monospaced.bolditalic.korean-baekmuk=Baekmuk Gulim ++#monospaced.bolditalic.korean-baekmuk.motif=Baekmuk Gulim ++monospaced.bolditalic.korean-un=UnDotum Bold ++#monospaced.bolditalic.korean-un.motif=UnDotum Bold ++ ++dialog.plain.latin-1=DejaVu Sans ++#dialog.plain.latin-1.motif=LuxiSans-Regular ++dialog.plain.japanese-kochi=Kochi Gothic ++dialog.plain.japanese-sazanami=Sazanami Gothic ++dialog.plain.japanese-vlgothic=VL PGothic ++dialog.plain.korean-baekmuk=Baekmuk Gulim ++#dialog.plain.korean-baekmuk.motif=Baekmuk Gulim ++dialog.plain.korean-un=UnDotum ++#dialog.plain.korean-un.motif=UnDotum + ++dialog.bold.latin-1=DejaVu Sans Bold ++#dialog.bold.latin-1.motif=LuxiSans-Bold ++dialog.bold.japanese-kochi=Kochi Gothic ++dialog.bold.japanese-sazanami=Sazanami Gothic ++dialog.bold.japanese-vlgothic=VL PGothic ++dialog.bold.korean-baekmuk=Baekmuk Gulim ++#dialog.bold.korean-baekmuk.motif=Baekmuk Gulim ++dialog.bold.korean-un=UnDotum Bold ++#dialog.bold.korean-un.motif=UnDotum Bold ++ ++dialog.italic.latin-1=DejaVu Sans Oblique ++#dialog.italic.latin-1.motif=LuxiSans-Oblique ++dialog.italic.japanese-kochi=Kochi Gothic ++dialog.italic.japanese-sazanami=Sazanami Gothic ++dialog.italic.japanese-vlgothic=VL PGothic ++dialog.italic.korean-baekmuk=Baekmuk Gulim ++#dialog.italic.korean-baekmuk.motif=Baekmuk Gulim ++dialog.italic.korean-un=UnDotum ++#dialog.italic.korean-un.motif=UnDotum ++ ++dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique ++#dialog.bolditalic.latin-1.motif=LuxiSans-BoldOblique ++dialog.bolditalic.japanese-kochi=Kochi Gothic ++dialog.bolditalic.japanese-sazanami=Sazanami Gothic ++dialog.bolditalic.japanese-vlgothic=VL PGothic ++dialog.bolditalic.korean-baekmuk=Baekmuk Gulim ++#dialog.bolditalic.korean-baekmuk.motif=Baekmuk Gulim ++dialog.bolditalic.korean-un=UnDotum Bold ++#dialog.bolditalic.korean-un.motif=UnDotum Bold + + dialoginput.plain.latin-1=DejaVu Sans Mono +-dialoginput.plain.japanese-x0208=Kochi Gothic +-dialoginput.plain.korean=Baekmuk Dotum ++#dialoginput.plain.latin-1.motif=LuxiMono-Regular ++dialoginput.plain.japanese-kochi=Kochi Gothic ++dialoginput.plain.japanese-sazanami=Sazanami Gothic ++dialoginput.plain.japanese-vlgothic=VL Gothic ++dialoginput.plain.korean-baekmuk=Baekmuk Gulim ++#dialoginput.plain.korean-baekmuk.motif=Baekmuk Gulim ++dialoginput.plain.korean-un=UnDotum ++#dialoginput.plain.korean-un.motif=UnDotum + + dialoginput.bold.latin-1=DejaVu Sans Mono Bold +-dialoginput.bold.japanese-x0208=Kochi Gothic +-dialoginput.bold.korean=Baekmuk Dotum ++#dialoginput.bold.latin-1.motif=LuxiMono-Bold ++dialoginput.bold.japanese-kochi=Kochi Gothic ++dialoginput.bold.japanese-sazanami=Sazanami Gothic ++dialoginput.bold.japanese-vlgothic=VL Gothic ++dialoginput.bold.korean-baekmuk=Baekmuk Gulim ++#dialoginput.bold.korean-baekmuk.motif=Baekmuk Gulim ++dialoginput.bold.korean-un=UnDotum Bold ++#dialoginput.bold.korean-un.motif=UnDotum Bold + + dialoginput.italic.latin-1=DejaVu Sans Mono Oblique +-dialoginput.italic.japanese-x0208=Kochi Gothic +-dialoginput.italic.korean=Baekmuk Dotum ++#dialoginput.italic.latin-1.motif=LuxiMono-Oblique ++dialoginput.italic.japanese-kochi=Kochi Gothic ++dialoginput.italic.japanese-sazanami=Sazanami Gothic ++dialoginput.italic.japanese-vlgothic=VL Gothic ++dialoginput.italic.korean-baekmuk=Baekmuk Gulim ++#dialoginput.italic.korean-baekmuk.motif=Baekmuk Gulim ++dialoginput.italic.korean-un=UnDotum ++#dialoginput.italic.korean-un.motif=UnDotum + + dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique +-dialoginput.bolditalic.japanese-x0208=Kochi Gothic +-dialoginput.bolditalic.korean=Baekmuk Dotum +- +-allfonts.chinese-big5=AR PL ZenKai Uni +-allfonts.chinese-gb18030=AR PL ZenKai Uni ++#dialoginput.bolditalic.latin-1.motif=LuxiMono-BoldOblique ++dialoginput.bolditalic.japanese-kochi=Kochi Gothic ++dialoginput.bolditalic.japanese-sazanami=Sazanami Gothic ++dialoginput.bolditalic.japanese-vlgothic=VL Gothic ++dialoginput.bolditalic.korean-baekmuk=Baekmuk Gulim ++#dialoginput.bolditalic.korean-baekmuk.motif=Baekmuk Gulim ++dialoginput.bolditalic.korean-un=UnDotum Bold ++#dialoginput.bolditalic.korean-un.motif=UnDotum Bold + + # Search Sequences + + sequence.allfonts=latin-1 +-sequence.allfonts.Big5=chinese-big5,latin-1 +-sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1 +-sequence.allfonts.EUC-KR=korean,latin-1 +-sequence.allfonts.GB18030=chinese-gb18030,latin-1 +-sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean ++sequence.allfonts.GB18030=latin-1,umingcn,shanheisun,wqy-zenhei ++sequence.allfonts.GB2312=latin-1,umingcn,shanheisun,wqy-zenhei ++sequence.allfonts.GBK=latin-1,umingcn,shanheisun,wqy-zenhei ++sequence.allfonts.x-euc-jp-linux=latin-1,japanese-vlgothic,japanese-kochi,japanese-sazanami ++sequence.allfonts.EUC-KR=latin-1,korean-un,korean-baekmuk ++sequence.allfonts.Big5=latin-1,umingtw,shanheisun,wqy-zenhei ++sequence.allfonts.Big5-HKSCS=latin-1,uminghk,shanheisun,wqy-zenhei ++#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala ++sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu ++ ++# Exclusion Ranges ++ ++exclusion.japanese-kochi=0390-03d6,2200-22ef,2701-27be ++exclusion.japanese-sazanami=0390-03d6,2200-22ef,2701-27be ++exclusion.japanese-vlgothic=0390-03d6,2200-22ef,2701-27be + + # Font File Names + +@@ -143,8 +290,58 @@ + filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf + filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf + +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf +-filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf +-filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf ++filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc ++filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc ++filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf ++ ++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf + filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf ++filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf ++filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf ++filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf ++filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf ++filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf ++filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf ++filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf ++filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf ++#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf ++ ++filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf ++filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf ++filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf ++filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf ++filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf ++filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf ++filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf ++filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf ++filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf ++filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf ++filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf ++filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf ++ ++# AWT X11 font paths ++awtfontpath.latin-1=/usr/share/fonts/X11/Type1 ++awtfontpath.umingcn=/usr/share/fonts/truetype/arphic ++awtfontpath.uminghk=/usr/share/fonts/truetype/arphic ++awtfontpath.umingtw=/usr/share/fonts/truetype/arphic ++awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic ++awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy ++awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi ++awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami ++awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic ++awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk ++awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts From doko at ubuntu.com Fri May 29 01:16:31 2009 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 29 May 2009 10:16:31 +0200 Subject: IcedTea7 1.10 Release Status In-Reply-To: <1243583547.4800.18.camel@hermans.wildebeest.org> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> Message-ID: <4A1F99DF.4040009@ubuntu.com> Mark Wielaard schrieb: > Hi Andrew, > > On Thu, 2009-05-28 at 21:07 +0100, Andrew John Hughes wrote: >> CACAO seems to have broken since 1.9: >> >> LOG: [0x00002af94c0f01e0] We received a SIGSEGV and tried to handle >> it, but we were >> LOG: [0x00002af94c0f01e0] unable to find a Java method at: >> LOG: [0x00002af94c0f01e0] >> LOG: [0x00002af94c0f01e0] PC=0x00002af94c1526b1 >> LOG: [0x00002af94c0f01e0] >> LOG: [0x00002af94c0f01e0] Dumping the current stacktrace: >> at java.lang.String.()V(String.java:1218) >> LOG: [0x00002af94c0f01e0] Exiting... >> >> Anyone have any ideas? > > I am not seeing that failure, but I am seeing: > LOG: [0xb7f346c0] system_mmap_anonymous: mmap failed: Permission denied > Which seems to be caused by the icedtea-cacao-no-mmap-first-page.patch > not being applied. fixed the latter in the repository, using the patch from IcedTea6. Matthias From gbenson at redhat.com Fri May 29 02:10:53 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 29 May 2009 09:10:53 +0000 Subject: changeset in /hg/icedtea6: 2009-05-29 Gary Benson changeset 1c47ca6df830 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1c47ca6df830 description: 2009-05-29 Gary Benson * ports/hotspot/src/share/vm/shark/sharkState.hpp (SharkState::_has_safepointed): New field. (SharkState::has_safepointed): New method. (SharkState::set_has_safepointed): Likewise. * ports/hotspot/src/share/vm/shark/sharkState.cpp (SharkState::SharkState): Initialize the above. (SharkState::equal_to): Compare the above. (SharkState::merge): Merge the above. * ports/hotspot/src/share/vm/shark/sharkBlock.hpp (SharkBlock::add_safepoint): Replaced with... (SharkBlock::maybe_add_safepoint): New method. * ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::add_safepoint): Replaced with... (SharkBlock::maybe_add_safepoint): New method. (SharkBlock::parse_bytecode): Updated for above. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::add_safepoint): Replaced with... (SharkTopLevelBlock::maybe_add_safepoint): New method. (SharkTopLevelBlock::call_vm): Mark that a safepoint check has occurred if a full VM call is made. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::add_safepoint): Replaced with... (SharkTopLevelBlock::maybe_add_safepoint): New method. (SharkTopLevelBlock::do_return): Updated for above. (SharkTopLevelBlock::do_call): Mark that a safepoint check has occurred if a non-inlined Java call is made. diffstat: 7 files changed, 74 insertions(+), 13 deletions(-) ChangeLog | 31 +++++++++++++++ ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 10 ++-- ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 2 ports/hotspot/src/share/vm/shark/sharkState.cpp | 12 ++++- ports/hotspot/src/share/vm/shark/sharkState.hpp | 12 +++++ ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 14 +++++- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 6 +- diffs (232 lines): diff -r 797d59eaba38 -r 1c47ca6df830 ChangeLog --- a/ChangeLog Thu May 28 16:56:19 2009 +0100 +++ b/ChangeLog Fri May 29 10:12:01 2009 +0100 @@ -1,3 +1,34 @@ 2009-05-28 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkState.hpp + (SharkState::_has_safepointed): New field. + (SharkState::has_safepointed): New method. + (SharkState::set_has_safepointed): Likewise. + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkState::SharkState): Initialize the above. + (SharkState::equal_to): Compare the above. + (SharkState::merge): Merge the above. + + * ports/hotspot/src/share/vm/shark/sharkBlock.hpp + (SharkBlock::add_safepoint): Replaced with... + (SharkBlock::maybe_add_safepoint): New method. + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp + (SharkBlock::add_safepoint): Replaced with... + (SharkBlock::maybe_add_safepoint): New method. + (SharkBlock::parse_bytecode): Updated for above. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::add_safepoint): Replaced with... + (SharkTopLevelBlock::maybe_add_safepoint): New method. + (SharkTopLevelBlock::call_vm): Mark that a safepoint check + has occurred if a full VM call is made. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::add_safepoint): Replaced with... + (SharkTopLevelBlock::maybe_add_safepoint): New method. + (SharkTopLevelBlock::do_return): Updated for above. + (SharkTopLevelBlock::do_call): Mark that a safepoint check + has occurred if a non-inlined Java call is made. + 2009-05-28 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Fri May 29 10:12:01 2009 +0100 @@ -74,24 +74,24 @@ void SharkBlock::parse_bytecode(int star case Bytecodes::_if_icmpgt: case Bytecodes::_if_icmpge: if (iter()->get_dest() <= bci()) - add_safepoint(); + maybe_add_safepoint(); break; case Bytecodes::_goto_w: if (iter()->get_far_dest() <= bci()) - add_safepoint(); + maybe_add_safepoint(); break; case Bytecodes::_tableswitch: case Bytecodes::_lookupswitch: if (switch_default_dest() <= bci()) { - add_safepoint(); + maybe_add_safepoint(); break; } int len = switch_table_length(); for (int i = 0; i < len; i++) { if (switch_dest(i) <= bci()) { - add_safepoint(); + maybe_add_safepoint(); break; } } @@ -1138,7 +1138,7 @@ void SharkBlock::do_zero_check(SharkValu ShouldNotCallThis(); } -void SharkBlock::add_safepoint() +void SharkBlock::maybe_add_safepoint() { ShouldNotCallThis(); } diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Fri May 29 10:12:01 2009 +0100 @@ -231,7 +231,7 @@ class SharkBlock : public ResourceObj { // Safepoints protected: - virtual void add_safepoint(); + virtual void maybe_add_safepoint(); // Traps protected: diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkState.cpp --- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Fri May 29 10:12:01 2009 +0100 @@ -33,7 +33,8 @@ SharkState::SharkState(SharkBlock* block _function(function), _method(NULL), _oop_tmp(NULL), - _frame_cache(NULL) + _frame_cache(NULL), + _has_safepointed(false) { initialize(NULL); } @@ -43,7 +44,8 @@ SharkState::SharkState(SharkBlock* block _function(state->function()), _method(state->method()), _oop_tmp(state->oop_tmp()), - _frame_cache(NULL) + _frame_cache(NULL), + _has_safepointed(state->has_safepointed()) { initialize(state); } @@ -103,6 +105,9 @@ bool SharkState::equal_to(SharkState *ot return false; if (num_monitors() != other->num_monitors()) + return false; + + if (has_safepointed() != other->has_safepointed()) return false; // Local variables @@ -215,6 +220,9 @@ void SharkState::merge(SharkState* other // Frame cache frame_cache()->merge(other->frame_cache()); + + // Safepointed status + set_has_safepointed(this->has_safepointed() && other->has_safepointed()); } void SharkState::decache_for_Java_call(ciMethod* callee) diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkState.hpp --- a/ports/hotspot/src/share/vm/shark/sharkState.hpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkState.hpp Fri May 29 10:12:01 2009 +0100 @@ -45,6 +45,7 @@ class SharkState : public ResourceObj { SharkValue** _sp; int _num_monitors; llvm::Value* _oop_tmp; + bool _has_safepointed; public: SharkBlock *block() const @@ -159,6 +160,17 @@ class SharkState : public ResourceObj { void set_oop_tmp(llvm::Value* oop_tmp) { _oop_tmp = oop_tmp; + } + + // Safepointed status + public: + bool has_safepointed() const + { + return _has_safepointed; + } + void set_has_safepointed(bool has_safepointed) + { + _has_safepointed = has_safepointed; } // Comparison diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Fri May 29 10:12:01 2009 +0100 @@ -435,8 +435,11 @@ void SharkTopLevelBlock::handle_exceptio handle_return(T_VOID, exception); } -void SharkTopLevelBlock::add_safepoint() -{ +void SharkTopLevelBlock::maybe_add_safepoint() +{ + if (current_state()->has_safepointed()) + return; + BasicBlock *orig_block = builder()->GetInsertBlock(); SharkState *orig_state = current_state()->copy(); @@ -462,6 +465,8 @@ void SharkTopLevelBlock::add_safepoint() builder()->SetInsertPoint(safepointed); current_state()->merge(orig_state, orig_block, safepointed_block); + + current_state()->set_has_safepointed(true); } void SharkTopLevelBlock::do_trap(int trap_request) @@ -720,7 +725,7 @@ void SharkTopLevelBlock::do_return(Basic { if (target()->intrinsic_id() == vmIntrinsics::_Object_init) call_register_finalizer(local(0)->jobject_value()); - add_safepoint(); + maybe_add_safepoint(); handle_return(type, NULL); } @@ -1142,6 +1147,9 @@ void SharkTopLevelBlock::do_call() // Check for pending exceptions check_pending_exception(EX_CHECK_FULL); + + // Mark that a safepoint check has occurred + current_state()->set_has_safepointed(true); } void SharkTopLevelBlock::do_instance_check() diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Fri May 29 10:12:01 2009 +0100 @@ -257,8 +257,10 @@ class SharkTopLevelBlock : public SharkB llvm::CallInst *res = builder()->CreateCall(callee, args_start, args_end); function()->reset_last_Java_frame(); current_state()->cache_after_VM_call(); - if (ea != EX_CHECK_NONE) + if (ea != EX_CHECK_NONE) { check_pending_exception(ea); + current_state()->set_has_safepointed(true); + } return res; } @@ -308,7 +310,7 @@ class SharkTopLevelBlock : public SharkB // Safepoints private: - void add_safepoint(); + void maybe_add_safepoint(); // Traps private: From gbenson at redhat.com Fri May 29 02:20:47 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 29 May 2009 10:20:47 +0100 Subject: Shark safepoint removal (part 1) Message-ID: <20090529092047.GA3554@redhat.com> Hi all, In HotSpot, whenever the garbage collector needs to run (and for some other reasons) the VM must be brought to a safepoint, where all the threads stop and wait for the GC (or whatever) to complete. This means that running threads need to periodically check to see if a safepoint is requested. There are a couple of places where Java methods must check. Each loop must have at least one safepoint, and a check must also be performed when a method returns. There are also a couple of places where a safepoint check implicitly happens -- when a Java method is called, for example, or for certain calls to VM functions. This commit allows Shark to keep track of these implicit safepoints and use them to eliminate explicit ones. Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r 797d59eaba38 -r 1c47ca6df830 ChangeLog --- a/ChangeLog Thu May 28 16:56:19 2009 +0100 +++ b/ChangeLog Fri May 29 10:12:01 2009 +0100 @@ -1,3 +1,34 @@ +2009-05-29 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkState.hpp + (SharkState::_has_safepointed): New field. + (SharkState::has_safepointed): New method. + (SharkState::set_has_safepointed): Likewise. + * ports/hotspot/src/share/vm/shark/sharkState.cpp + (SharkState::SharkState): Initialize the above. + (SharkState::equal_to): Compare the above. + (SharkState::merge): Merge the above. + + * ports/hotspot/src/share/vm/shark/sharkBlock.hpp + (SharkBlock::add_safepoint): Replaced with... + (SharkBlock::maybe_add_safepoint): New method. + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp + (SharkBlock::add_safepoint): Replaced with... + (SharkBlock::maybe_add_safepoint): New method. + (SharkBlock::parse_bytecode): Updated for above. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::add_safepoint): Replaced with... + (SharkTopLevelBlock::maybe_add_safepoint): New method. + (SharkTopLevelBlock::call_vm): Mark that a safepoint check + has occurred if a full VM call is made. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::add_safepoint): Replaced with... + (SharkTopLevelBlock::maybe_add_safepoint): New method. + (SharkTopLevelBlock::do_return): Updated for above. + (SharkTopLevelBlock::do_call): Mark that a safepoint check + has occurred if a non-inlined Java call is made. + 2009-05-28 Gary Benson * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Fri May 29 10:12:01 2009 +0100 @@ -74,24 +74,24 @@ case Bytecodes::_if_icmpgt: case Bytecodes::_if_icmpge: if (iter()->get_dest() <= bci()) - add_safepoint(); + maybe_add_safepoint(); break; case Bytecodes::_goto_w: if (iter()->get_far_dest() <= bci()) - add_safepoint(); + maybe_add_safepoint(); break; case Bytecodes::_tableswitch: case Bytecodes::_lookupswitch: if (switch_default_dest() <= bci()) { - add_safepoint(); + maybe_add_safepoint(); break; } int len = switch_table_length(); for (int i = 0; i < len; i++) { if (switch_dest(i) <= bci()) { - add_safepoint(); + maybe_add_safepoint(); break; } } @@ -1138,7 +1138,7 @@ ShouldNotCallThis(); } -void SharkBlock::add_safepoint() +void SharkBlock::maybe_add_safepoint() { ShouldNotCallThis(); } diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Fri May 29 10:12:01 2009 +0100 @@ -231,7 +231,7 @@ // Safepoints protected: - virtual void add_safepoint(); + virtual void maybe_add_safepoint(); // Traps protected: diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkState.cpp --- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Fri May 29 10:12:01 2009 +0100 @@ -33,7 +33,8 @@ _function(function), _method(NULL), _oop_tmp(NULL), - _frame_cache(NULL) + _frame_cache(NULL), + _has_safepointed(false) { initialize(NULL); } @@ -43,7 +44,8 @@ _function(state->function()), _method(state->method()), _oop_tmp(state->oop_tmp()), - _frame_cache(NULL) + _frame_cache(NULL), + _has_safepointed(state->has_safepointed()) { initialize(state); } @@ -105,6 +107,9 @@ if (num_monitors() != other->num_monitors()) return false; + if (has_safepointed() != other->has_safepointed()) + return false; + // Local variables for (int i = 0; i < max_locals(); i++) { SharkValue *value = local(i); @@ -215,6 +220,9 @@ // Frame cache frame_cache()->merge(other->frame_cache()); + + // Safepointed status + set_has_safepointed(this->has_safepointed() && other->has_safepointed()); } void SharkState::decache_for_Java_call(ciMethod* callee) diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkState.hpp --- a/ports/hotspot/src/share/vm/shark/sharkState.hpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkState.hpp Fri May 29 10:12:01 2009 +0100 @@ -45,6 +45,7 @@ SharkValue** _sp; int _num_monitors; llvm::Value* _oop_tmp; + bool _has_safepointed; public: SharkBlock *block() const @@ -161,6 +162,17 @@ _oop_tmp = oop_tmp; } + // Safepointed status + public: + bool has_safepointed() const + { + return _has_safepointed; + } + void set_has_safepointed(bool has_safepointed) + { + _has_safepointed = has_safepointed; + } + // Comparison public: bool equal_to(SharkState* other); diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Fri May 29 10:12:01 2009 +0100 @@ -435,8 +435,11 @@ handle_return(T_VOID, exception); } -void SharkTopLevelBlock::add_safepoint() +void SharkTopLevelBlock::maybe_add_safepoint() { + if (current_state()->has_safepointed()) + return; + BasicBlock *orig_block = builder()->GetInsertBlock(); SharkState *orig_state = current_state()->copy(); @@ -462,6 +465,8 @@ builder()->SetInsertPoint(safepointed); current_state()->merge(orig_state, orig_block, safepointed_block); + + current_state()->set_has_safepointed(true); } void SharkTopLevelBlock::do_trap(int trap_request) @@ -720,7 +725,7 @@ { if (target()->intrinsic_id() == vmIntrinsics::_Object_init) call_register_finalizer(local(0)->jobject_value()); - add_safepoint(); + maybe_add_safepoint(); handle_return(type, NULL); } @@ -1142,6 +1147,9 @@ // Check for pending exceptions check_pending_exception(EX_CHECK_FULL); + + // Mark that a safepoint check has occurred + current_state()->set_has_safepointed(true); } void SharkTopLevelBlock::do_instance_check() diff -r 797d59eaba38 -r 1c47ca6df830 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Thu May 28 16:56:19 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Fri May 29 10:12:01 2009 +0100 @@ -257,8 +257,10 @@ llvm::CallInst *res = builder()->CreateCall(callee, args_start, args_end); function()->reset_last_Java_frame(); current_state()->cache_after_VM_call(); - if (ea != EX_CHECK_NONE) + if (ea != EX_CHECK_NONE) { check_pending_exception(ea); + current_state()->set_has_safepointed(true); + } return res; } @@ -308,7 +310,7 @@ // Safepoints private: - void add_safepoint(); + void maybe_add_safepoint(); // Traps private: From bugzilla-daemon at icedtea.classpath.org Fri May 29 02:42:23 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 May 2009 09:42:23 +0000 Subject: [Bug 343] New: *_CHANGESET macros used as part of directory names Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=343 Summary: *_CHANGESET macros used as part of directory names Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com Seen in 7: The Makefile *_CHANGESET macros are used to determine the toplevel directories of the tarballs. When specifying the tarball on your own using the --with-...-zip options, this assumption breaks. mv: cannot stat `jdk-567b20871c5d': No such file or directory make[1]: *** [stamps/extract.stamp] Error 1 -- 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 May 29 02:52:25 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 May 2009 09:52:25 +0000 Subject: [Bug 344] New: cacao build broken in IcedTea7 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=344 Summary: cacao build broken in IcedTea7 Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com a build with changeset 1840 succeeds, current IcedTea7 breaks: Making install in include make[5]: Entering directory `/scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/cacao/cacao-0.99.4/src/native/include' ../../../src/cacaoh/cacaoh -bootclasspath /scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/lib/rt -d . java.lang.Class java.lang.ClassNotFoundException: java/lang/Object /bin/bash: line 2: 10380 Aborted ../../../src/cacaoh/cacaoh -bootclasspath /scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/lib/rt -d . $class make[5]: *** [java_lang_Class.h] Error 134 make[5]: *** Waiting for unfinished jobs.... ../../../src/cacaoh/cacaoh -bootclasspath /scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/lib/rt -d . java.lang.Thread java.lang.ClassNotFoundException: java/lang/Object ../../../src/cacaoh/cacaoh -bootclasspath /scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/lib/rt -d . java.lang.String /bin/bash: line 2: 10388 Aborted ../../../src/cacaoh/cacaoh -bootclasspath /scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/lib/rt -d . $class ../../../src/cacaoh/cacaoh -bootclasspath /scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/lib/rt -d . java.lang.Object make[5]: *** [java_lang_Thread.h] Error 134 java.lang.ClassNotFoundException: java/lang/Object /bin/bash: line 2: 10389 Aborted ../../../src/cacaoh/cacaoh -bootclasspath /scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/lib/rt -d . $class java.lang.ClassNotFoundException: java/lang/Object make[5]: *** [java_lang_Object.h] Error 134 /bin/bash: line 2: 10390 Aborted ../../../src/cacaoh/cacaoh -bootclasspath /scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/lib/rt -d . $class make[5]: *** [java_lang_String.h] Error 134 make[5]: Leaving directory `/scratch/packages/openjdk/7/openjdk-7-7b59-1.10/build/cacao/cacao-0.99.4/src/native/include' make[4]: *** [install-recursive] Error 1 configured with cd build && CACAO_CONFIGURE_ARGS='--host=i686-linux-gnulp --build=i686-linux-gnulp' LIBFFI_LIBS=-lffi_pic ../configure --with-icedtea --with-icedtea-home=/usr/lib/jvm/java-6-openjdk --with-pkgversion="7b59-0ubuntu1~karmic~ppa1" --with-xalan2-jar=/usr/share/java/xalan2.jar --with-xalan2-serializer-jar=/usr/share/java/serializer.jar --with-rhino=/usr/share/java/js.jar --with-openjdk-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/openjdk.tar.gz --with-hotspot-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/hotspot.tar.gz --with-corba-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/corba.tar.gz --with-jaxp-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jaxp.tar.gz --with-jaxws-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jaxws.tar.gz --with-jdk-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/jdk-dfsg.tar.gz --with-langtools-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/langtools.tar.gz --with-cacao-src-zip=/scratch/packages/openjdk/7/openjdk-7-7b59/cacao-0.99.4.tar.bz2 --with-hotspot-build --with-parallel-jobs=4 --enable-liveconnect --enable-pulse-java --with-additional-vms=cacao,zero --host=i686-linux-gnulp --build=i686-linux-gnulp -- 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 doko at ubuntu.com Fri May 29 02:57:12 2009 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 29 May 2009 11:57:12 +0200 Subject: IcedTea7 1.10 Release Status In-Reply-To: <4A1F99DF.4040009@ubuntu.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> <4A1F99DF.4040009@ubuntu.com> Message-ID: <4A1FB178.3030902@ubuntu.com> Matthias Klose schrieb: > Mark Wielaard schrieb: >> Hi Andrew, >> >> On Thu, 2009-05-28 at 21:07 +0100, Andrew John Hughes wrote: >>> CACAO seems to have broken since 1.9: >>> >>> LOG: [0x00002af94c0f01e0] We received a SIGSEGV and tried to handle >>> it, but we were >>> LOG: [0x00002af94c0f01e0] unable to find a Java method at: >>> LOG: [0x00002af94c0f01e0] >>> LOG: [0x00002af94c0f01e0] PC=0x00002af94c1526b1 >>> LOG: [0x00002af94c0f01e0] >>> LOG: [0x00002af94c0f01e0] Dumping the current stacktrace: >>> at java.lang.String.()V(String.java:1218) >>> LOG: [0x00002af94c0f01e0] Exiting... >>> >>> Anyone have any ideas? >> I am not seeing that failure, but I am seeing: >> LOG: [0xb7f346c0] system_mmap_anonymous: mmap failed: Permission denied >> Which seems to be caused by the icedtea-cacao-no-mmap-first-page.patch >> not being applied. > > fixed the latter in the repository, using the patch from IcedTea6. the build is still broken. filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=344 a build with changeset 1840 succeeds. Matthias From bugzilla-daemon at icedtea.classpath.org Fri May 29 03:04:50 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 May 2009 10:04:50 +0000 Subject: [Bug 340] files with "ibm confidential" header files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=340 ------- Comment #3 from doko at ubuntu.com 2009-05-29 10:04 ------- AFAIU the two copyright notices contradict. /* * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved. * 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. * * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ /* * * * (C) Copyright IBM Corp. 1999 - All Rights Reserved * * Portions Copyright 2007 by Sun Microsystems, Inc., * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. * All rights reserved. * * This software is the confidential and proprietary information * of Sun Microsystems, Inc. ("Confidential Information"). You * shall not disclose such Confidential Information and shall use * it only in accordance with the terms of the license agreement * you entered into with Sun. * * The original version of this source code and documentation is * copyrighted and owned by IBM. These materials are provided * under terms of a License Agreement between IBM and Sun. * This technology is protected by multiple US and International * patents. This notice and attribution to IBM may not be removed. * */ -- 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 May 29 03:14:44 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 May 2009 10:14:44 +0000 Subject: [Bug 341] questionable license headers in J2DBench Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=341 ------- Comment #2 from doko at ubuntu.com 2009-05-29 10:14 ------- /* * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * - Neither the name of Sun Microsystems nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ this looks like a license which allows inclusion in Debian/Fedora. Unsure if that change, or why we do remove this. -- 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 Fri May 29 04:27:35 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 12:27:35 +0100 Subject: IcedTea7 1.10 Release Status In-Reply-To: <1243583547.4800.18.camel@hermans.wildebeest.org> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905290427v4c34db7cj64ce1c8ec53b3902@mail.gmail.com> 2009/5/29 Mark Wielaard : > Hi Andrew, > > On Thu, 2009-05-28 at 21:07 +0100, Andrew John Hughes wrote: >> CACAO seems to have broken since 1.9: >> >> LOG: [0x00002af94c0f01e0] We received a SIGSEGV and tried to handle >> it, but we were >> LOG: [0x00002af94c0f01e0] unable to find a Java method at: >> LOG: [0x00002af94c0f01e0] >> LOG: [0x00002af94c0f01e0] PC=0x00002af94c1526b1 >> LOG: [0x00002af94c0f01e0] >> LOG: [0x00002af94c0f01e0] Dumping the current stacktrace: >> ? ? ? at java.lang.String.()V(String.java:1218) >> LOG: [0x00002af94c0f01e0] Exiting... >> >> Anyone have any ideas? > > I am not seeing that failure, but I am seeing: > LOG: [0xb7f346c0] system_mmap_anonymous: mmap failed: Permission denied > Which seems to be caused by the icedtea-cacao-no-mmap-first-page.patch > not being applied. > > The icedtea6 --enable-cacao build seems to go fine. > > Cheers, > > Mark > > It's failing for me on both Fedora and Gentoo. The mmap patch only seems relevant to ARM so I doubt it will make a difference, though thanks to Matthias for porting this. I don't think CACAO is release critical enough to not do a release today, but if someone has a fix then I'll obviously include it. We can always fix it with the inevitable minor releases we'll need for security updates. -- 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 Fri May 29 04:27:25 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 May 2009 11:27:25 +0000 Subject: [Bug 344] cacao build broken in IcedTea7 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=344 ------- Comment #1 from gnu_andrew at member.fsf.org 2009-05-29 11:27 ------- Builds fine for me on Fedora and Gentoo. Seems there is something wrong with your cacaoh. -- 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 Fri May 29 04:37:39 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 29 May 2009 11:37:39 +0000 Subject: changeset in /hg/icedtea6: 2009-05-29 Gary Benson changeset e3339b19c3d9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e3339b19c3d9 description: 2009-05-29 Gary Benson * ports/hotspot/src/share/vm/shark/sharkBlock.hpp (SharkBlock::maybe_add_safepoint): Replaced with... (SharkBlock::maybe_add_backedge_safepoint): New method. * ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::maybe_add_safepoint): Replaced with... (SharkBlock::maybe_add_backedge_safepoint): New method. (SharkBlock::parse_bytecode): Updated for above. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkBlock::maybe_add_backedge_safepoint): New method. (SharkBlock::_can_reach_visited): New field. (SharkBlock::can_reach): New method. (SharkBlock::can_reach_helper): Likewise. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkBlock::maybe_add_backedge_safepoint): New method. (SharkBlock::can_reach): Likewise. (SharkBlock::can_reach_helper): Likewise. diffstat: 5 files changed, 79 insertions(+), 6 deletions(-) ChangeLog | 20 ++++++ ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 10 +-- ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 2 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 45 +++++++++++++++ ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 8 ++ diffs (153 lines): diff -r 1c47ca6df830 -r e3339b19c3d9 ChangeLog --- a/ChangeLog Fri May 29 10:12:01 2009 +0100 +++ b/ChangeLog Fri May 29 12:38:51 2009 +0100 @@ -1,3 +1,23 @@ 2009-05-29 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkBlock.hpp + (SharkBlock::maybe_add_safepoint): Replaced with... + (SharkBlock::maybe_add_backedge_safepoint): New method. + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp + (SharkBlock::maybe_add_safepoint): Replaced with... + (SharkBlock::maybe_add_backedge_safepoint): New method. + (SharkBlock::parse_bytecode): Updated for above. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkBlock::maybe_add_backedge_safepoint): New method. + (SharkBlock::_can_reach_visited): New field. + (SharkBlock::can_reach): New method. + (SharkBlock::can_reach_helper): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkBlock::maybe_add_backedge_safepoint): New method. + (SharkBlock::can_reach): Likewise. + (SharkBlock::can_reach_helper): Likewise. + 2009-05-29 Gary Benson * ports/hotspot/src/share/vm/shark/sharkState.hpp diff -r 1c47ca6df830 -r e3339b19c3d9 ports/hotspot/src/share/vm/shark/sharkBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Fri May 29 10:12:01 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Fri May 29 12:38:51 2009 +0100 @@ -74,24 +74,24 @@ void SharkBlock::parse_bytecode(int star case Bytecodes::_if_icmpgt: case Bytecodes::_if_icmpge: if (iter()->get_dest() <= bci()) - maybe_add_safepoint(); + maybe_add_backedge_safepoint(); break; case Bytecodes::_goto_w: if (iter()->get_far_dest() <= bci()) - maybe_add_safepoint(); + maybe_add_backedge_safepoint(); break; case Bytecodes::_tableswitch: case Bytecodes::_lookupswitch: if (switch_default_dest() <= bci()) { - maybe_add_safepoint(); + maybe_add_backedge_safepoint(); break; } int len = switch_table_length(); for (int i = 0; i < len; i++) { if (switch_dest(i) <= bci()) { - maybe_add_safepoint(); + maybe_add_backedge_safepoint(); break; } } @@ -1138,7 +1138,7 @@ void SharkBlock::do_zero_check(SharkValu ShouldNotCallThis(); } -void SharkBlock::maybe_add_safepoint() +void SharkBlock::maybe_add_backedge_safepoint() { ShouldNotCallThis(); } diff -r 1c47ca6df830 -r e3339b19c3d9 ports/hotspot/src/share/vm/shark/sharkBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Fri May 29 10:12:01 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Fri May 29 12:38:51 2009 +0100 @@ -231,7 +231,7 @@ class SharkBlock : public ResourceObj { // Safepoints protected: - virtual void maybe_add_safepoint(); + virtual void maybe_add_backedge_safepoint(); // Traps protected: diff -r 1c47ca6df830 -r e3339b19c3d9 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Fri May 29 10:12:01 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Fri May 29 12:38:51 2009 +0100 @@ -469,6 +469,51 @@ void SharkTopLevelBlock::maybe_add_safep current_state()->set_has_safepointed(true); } +void SharkTopLevelBlock::maybe_add_backedge_safepoint() +{ + if (current_state()->has_safepointed()) + return; + + for (int i = 0; i < num_successors(); i++) { + if (successor(i)->can_reach(this)) { + maybe_add_safepoint(); + break; + } + } +} + +bool SharkTopLevelBlock::can_reach(SharkTopLevelBlock* other) +{ + for (int i = 0; i < function()->block_count(); i++) + function()->block(i)->_can_reach_visited = false; + + return can_reach_helper(other); +} + +bool SharkTopLevelBlock::can_reach_helper(SharkTopLevelBlock* other) +{ + if (this == other) + return true; + + if (_can_reach_visited) + return false; + _can_reach_visited = true; + + if (!has_trap()) { + for (int i = 0; i < num_successors(); i++) { + if (successor(i)->can_reach_helper(other)) + return true; + } + } + + for (int i = 0; i < num_exceptions(); i++) { + if (exception(i)->can_reach_helper(other)) + return true; + } + + return false; +} + void SharkTopLevelBlock::do_trap(int trap_request) { current_state()->decache_for_trap(); diff -r 1c47ca6df830 -r e3339b19c3d9 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Fri May 29 10:12:01 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Fri May 29 12:38:51 2009 +0100 @@ -311,6 +311,14 @@ class SharkTopLevelBlock : public SharkB // Safepoints private: void maybe_add_safepoint(); + void maybe_add_backedge_safepoint(); + + // Loop safepoint removal + private: + bool _can_reach_visited; + + bool can_reach(SharkTopLevelBlock* other); + bool can_reach_helper(SharkTopLevelBlock* other); // Traps private: From gbenson at redhat.com Fri May 29 04:42:44 2009 From: gbenson at redhat.com (Gary Benson) Date: Fri, 29 May 2009 12:42:44 +0100 Subject: Shark safepoint removal (part 2) Message-ID: <20090529114243.GC3554@redhat.com> Hi again, In order to ensure the VM doesn't spend too long inbetween safepoint checks, HotSpot requires every loop to contain at least one safepoint check. This is done by inserting an explicit safepoint every time a branch moves backwards in the bytecode (which is called a backedge). Not all backedges are parts of loops, however. This commit makes Shark check whether the backedge is part of a loop, and omits the safepoint check otherwise. Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r 1c47ca6df830 -r e3339b19c3d9 ChangeLog --- a/ChangeLog Fri May 29 10:12:01 2009 +0100 +++ b/ChangeLog Fri May 29 12:38:51 2009 +0100 @@ -1,3 +1,23 @@ +2009-05-29 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkBlock.hpp + (SharkBlock::maybe_add_safepoint): Replaced with... + (SharkBlock::maybe_add_backedge_safepoint): New method. + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp + (SharkBlock::maybe_add_safepoint): Replaced with... + (SharkBlock::maybe_add_backedge_safepoint): New method. + (SharkBlock::parse_bytecode): Updated for above. + + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkBlock::maybe_add_backedge_safepoint): New method. + (SharkBlock::_can_reach_visited): New field. + (SharkBlock::can_reach): New method. + (SharkBlock::can_reach_helper): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkBlock::maybe_add_backedge_safepoint): New method. + (SharkBlock::can_reach): Likewise. + (SharkBlock::can_reach_helper): Likewise. + 2009-05-29 Gary Benson * ports/hotspot/src/share/vm/shark/sharkState.hpp diff -r 1c47ca6df830 -r e3339b19c3d9 ports/hotspot/src/share/vm/shark/sharkBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Fri May 29 10:12:01 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Fri May 29 12:38:51 2009 +0100 @@ -74,24 +74,24 @@ case Bytecodes::_if_icmpgt: case Bytecodes::_if_icmpge: if (iter()->get_dest() <= bci()) - maybe_add_safepoint(); + maybe_add_backedge_safepoint(); break; case Bytecodes::_goto_w: if (iter()->get_far_dest() <= bci()) - maybe_add_safepoint(); + maybe_add_backedge_safepoint(); break; case Bytecodes::_tableswitch: case Bytecodes::_lookupswitch: if (switch_default_dest() <= bci()) { - maybe_add_safepoint(); + maybe_add_backedge_safepoint(); break; } int len = switch_table_length(); for (int i = 0; i < len; i++) { if (switch_dest(i) <= bci()) { - maybe_add_safepoint(); + maybe_add_backedge_safepoint(); break; } } @@ -1138,7 +1138,7 @@ ShouldNotCallThis(); } -void SharkBlock::maybe_add_safepoint() +void SharkBlock::maybe_add_backedge_safepoint() { ShouldNotCallThis(); } diff -r 1c47ca6df830 -r e3339b19c3d9 ports/hotspot/src/share/vm/shark/sharkBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Fri May 29 10:12:01 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Fri May 29 12:38:51 2009 +0100 @@ -231,7 +231,7 @@ // Safepoints protected: - virtual void maybe_add_safepoint(); + virtual void maybe_add_backedge_safepoint(); // Traps protected: diff -r 1c47ca6df830 -r e3339b19c3d9 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Fri May 29 10:12:01 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Fri May 29 12:38:51 2009 +0100 @@ -469,6 +469,51 @@ current_state()->set_has_safepointed(true); } +void SharkTopLevelBlock::maybe_add_backedge_safepoint() +{ + if (current_state()->has_safepointed()) + return; + + for (int i = 0; i < num_successors(); i++) { + if (successor(i)->can_reach(this)) { + maybe_add_safepoint(); + break; + } + } +} + +bool SharkTopLevelBlock::can_reach(SharkTopLevelBlock* other) +{ + for (int i = 0; i < function()->block_count(); i++) + function()->block(i)->_can_reach_visited = false; + + return can_reach_helper(other); +} + +bool SharkTopLevelBlock::can_reach_helper(SharkTopLevelBlock* other) +{ + if (this == other) + return true; + + if (_can_reach_visited) + return false; + _can_reach_visited = true; + + if (!has_trap()) { + for (int i = 0; i < num_successors(); i++) { + if (successor(i)->can_reach_helper(other)) + return true; + } + } + + for (int i = 0; i < num_exceptions(); i++) { + if (exception(i)->can_reach_helper(other)) + return true; + } + + return false; +} + void SharkTopLevelBlock::do_trap(int trap_request) { current_state()->decache_for_trap(); diff -r 1c47ca6df830 -r e3339b19c3d9 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp --- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Fri May 29 10:12:01 2009 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Fri May 29 12:38:51 2009 +0100 @@ -311,6 +311,14 @@ // Safepoints private: void maybe_add_safepoint(); + void maybe_add_backedge_safepoint(); + + // Loop safepoint removal + private: + bool _can_reach_visited; + + bool can_reach(SharkTopLevelBlock* other); + bool can_reach_helper(SharkTopLevelBlock* other); // Traps private: From gnu_andrew at member.fsf.org Fri May 29 04:49:02 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 12:49:02 +0100 Subject: IcedTea7 1.10 Release Status In-Reply-To: <4A1F99DF.4040009@ubuntu.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> <4A1F99DF.4040009@ubuntu.com> Message-ID: <17c6771e0905290449x1f1b388bsbe491a00bc617555@mail.gmail.com> 2009/5/29 Matthias Klose : > Mark Wielaard schrieb: >> Hi Andrew, >> >> On Thu, 2009-05-28 at 21:07 +0100, Andrew John Hughes wrote: >>> CACAO seems to have broken since 1.9: >>> >>> LOG: [0x00002af94c0f01e0] We received a SIGSEGV and tried to handle >>> it, but we were >>> LOG: [0x00002af94c0f01e0] unable to find a Java method at: >>> LOG: [0x00002af94c0f01e0] >>> LOG: [0x00002af94c0f01e0] PC=0x00002af94c1526b1 >>> LOG: [0x00002af94c0f01e0] >>> LOG: [0x00002af94c0f01e0] Dumping the current stacktrace: >>> ? ? ?at java.lang.String.()V(String.java:1218) >>> LOG: [0x00002af94c0f01e0] Exiting... >>> >>> Anyone have any ideas? >> >> I am not seeing that failure, but I am seeing: >> LOG: [0xb7f346c0] system_mmap_anonymous: mmap failed: Permission denied >> Which seems to be caused by the icedtea-cacao-no-mmap-first-page.patch >> not being applied. > > fixed the latter in the repository, using the patch from IcedTea6. > > ?Matthias > Can you please add a summary line in your commit messages in future? They all just read 2009-05-29 Matthias Klose , which isn't very helpful. Same goes for most people on this list... :) It'd also be nice if you checked first before making more changes to the tree, especially when we are heading for a release. -- 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 Fri May 29 05:13:21 2009 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 29 May 2009 14:13:21 +0200 Subject: IcedTea7 1.10 Release Status In-Reply-To: <17c6771e0905290449x1f1b388bsbe491a00bc617555@mail.gmail.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> <4A1F99DF.4040009@ubuntu.com> <17c6771e0905290449x1f1b388bsbe491a00bc617555@mail.gmail.com> Message-ID: <4A1FD161.8090708@ubuntu.com> Andrew John Hughes schrieb: > 2009/5/29 Matthias Klose : > Can you please add a summary line in your commit messages in future? > They all just read 2009-05-29 Matthias Klose , which > isn't very helpful. Same goes for most people on this list... :) ok, it wasn't required so far. Still used from other projects to include a copy of the changelog entry. > It'd also be nice if you checked first before making more changes to > the tree, especially when we are heading for a release. it does fix cacao. the patch is cacao only, it's not new code, it does work in IcedTea6, fixes a bug which doesn't allow cacao to run, and was also reported by somebody else. I could make the same request not to reorganize things just before making a release. Matthias From gnu_andrew at member.fsf.org Fri May 29 05:47:13 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 13:47:13 +0100 Subject: IcedTea7 1.10 Release Status In-Reply-To: <4A1FD161.8090708@ubuntu.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> <4A1F99DF.4040009@ubuntu.com> <17c6771e0905290449x1f1b388bsbe491a00bc617555@mail.gmail.com> <4A1FD161.8090708@ubuntu.com> Message-ID: <17c6771e0905290547v28f9b5ebj75c2d91e568fb91c@mail.gmail.com> 2009/5/29 Matthias Klose : > Andrew John Hughes schrieb: >> 2009/5/29 Matthias Klose : > >> Can you please add a summary line in your commit messages in future? >> They all just read 2009-05-29 Matthias Klose , which >> isn't very helpful. ?Same goes for most people on this list... :) > > ok, it wasn't required so far. Still used from other projects to include a copy > of the changelog entry. > It's not required now, and I'm not suggesting not including a ChangeLog entry. It would just be nice for other users to have a simple summary at the top which displays when browsing the changesets: Take a look at http://icedtea.classpath.org/hg/icedtea/ and you'll see what I mean. Having the first line mean something would just be helpful. As I saw, the same is true for changesets from Lillian, Gary, etc. >> It'd also be nice if you checked first before making more changes to >> the tree, especially when we are heading for a release. > > it does fix cacao. the patch is cacao only, it's not new code, it does work in > IcedTea6, fixes a bug which doesn't allow cacao to run, and was also reported by > somebody else. I could make the same request not to reorganize things just > before making a release. > I deliberately haven't reorganised things. I just made the necessary changes for the plugin and netx code to build. I don't see any build breakages here for CACAO, nor do I follow which change you think broke your build. Can you point me to a link to a specific revision? What I do see is a segfault that suggests to me that a fix from upstream will be needed before CACAO works with IcedTea7. Does CACAO actually run for you? It did for me with 1.9 and b50, but doesn't any more. As I see it, we have two options. We can go ahead with a release with CACAO broken and fix this in a minor release. Or we can hold off until this is fixed. If a release doesn't happen, packages for J1 can still be created by tagging the tree with an appropriate identifier (e.g. debs-javaone or something) > ?Matthias > -- 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 mark at klomp.org Fri May 29 05:46:34 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 29 May 2009 14:46:34 +0200 Subject: IcedTea7 1.10 Release Status In-Reply-To: <4A1FB178.3030902@ubuntu.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> <4A1F99DF.4040009@ubuntu.com> <4A1FB178.3030902@ubuntu.com> Message-ID: <1243601194.4800.161.camel@hermans.wildebeest.org> Hi Matthias, On Fri, 2009-05-29 at 11:57 +0200, Matthias Klose wrote: > >> I am not seeing that failure, but I am seeing: > >> LOG: [0xb7f346c0] system_mmap_anonymous: mmap failed: Permission denied > >> Which seems to be caused by the icedtea-cacao-no-mmap-first-page.patch > >> not being applied. > > > > fixed the latter in the repository, using the patch from IcedTea6. Thanks! > the build is still broken. > filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=344 > a build with changeset 1840 succeeds. Which changeset is that exactly? 1840 is your local rev number, which might be different from other people's local rev number. For me 1840 is caf6ea78c242. Cheers, Mark From mark at klomp.org Fri May 29 05:49:19 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 29 May 2009 14:49:19 +0200 Subject: IcedTea7 1.10 Release Status In-Reply-To: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> Message-ID: <1243601360.4800.168.camel@hermans.wildebeest.org> On Thu, 2009-05-28 at 19:12 +0100, Andrew John Hughes wrote: > I've built most permutations I can think of. What's left to my mind is: > > * Check a cacao build works (this is the only one I've not done so far) This seems to be problematic. I haven't done a build against the latest tree yet, but I saw your bug report, that looks like the generic java launcher changed, so that some parameters for upper/lower bounds get passed wrongly to the garbage collector now. But doko reported he got a good build against an earlier changeset, so maybe it is something different. The mmap patch is definitely needed, but I am afraid that is not enough. > * Fix http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 - > narrowed this down to being a Debian/Ubuntu bug > * Get the ok on the plugin/javaws from Deepak > > Once these are ok, I plan to cut a release. Any objections? Seems fine. With all the changes that went on this week it would be good to get a full make check test results build on one or two architectures/distros to compare against. I can do some this weekend. Cheers, Mark From xerxes at zafena.se Fri May 29 05:52:28 2009 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Fri, 29 May 2009 14:52:28 +0200 Subject: [patch] icedtea7 change cacao .tar.gz to .tar.bz2 Message-ID: <4A1FDA8C.7010204@zafena.se> The attached patch fixes the icedtea7 build so that it dont redownload the cacao tarball on every build when doing make clean; make Cheers Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: cacao_tar.bz2.patch Type: text/x-patch Size: 970 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090529/b51a6746/cacao_tar.bz2.patch From gnu_andrew at member.fsf.org Fri May 29 06:01:12 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 14:01:12 +0100 Subject: IcedTea7 1.10 Release Status In-Reply-To: <1243601360.4800.168.camel@hermans.wildebeest.org> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <1243601360.4800.168.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905290601v4a982eepc2101ee09e349eae@mail.gmail.com> 2009/5/29 Mark Wielaard : > On Thu, 2009-05-28 at 19:12 +0100, Andrew John Hughes wrote: >> I've built most permutations I can think of. ?What's left to my mind is: >> >> * Check a cacao build works (this is the only one I've not done so far) > > This seems to be problematic. I haven't done a build against the latest > tree yet, but I saw your bug report, that looks like the generic java > launcher changed, so that some parameters for upper/lower bounds get > passed wrongly to the garbage collector now. But doko reported he got a > good build against an earlier changeset, so maybe it is something > different. The mmap patch is definitely needed, but I am afraid that is > not enough. > I find that hard to believe, given it segfaults for me on two platforms and also for Xerces. But of course I'd be more than happy if that is the case! >> * Fix http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=338 - >> narrowed this down to being a Debian/Ubuntu bug >> * Get the ok on the plugin/javaws from Deepak >> These are both now ok. Just cleaning up make distcheck (again...) >> Once these are ok, I plan to cut a release. ?Any objections? > > Seems fine. With all the changes that went on this week it would be good > to get a full make check test results build on one or two > architectures/distros to compare against. I can do some this weekend. > I don't think there were many changes to the actual JDK though (just build fixes) which is what the jtreg tests check. I was happy enough with the last set. At the moment, I just want to know whether to cut a 'proper' release or not, given that CACAO is broken (as regards actually running code) and unlikely to be fixed soon. Do people still want an IcedTea7 release for J1? > Cheers, > > Mark > > -- 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 Fri May 29 06:11:24 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 14:11:24 +0100 Subject: [patch] icedtea7 change cacao .tar.gz to .tar.bz2 In-Reply-To: <4A1FDA8C.7010204@zafena.se> References: <4A1FDA8C.7010204@zafena.se> Message-ID: <17c6771e0905290611s79635240v1cc5f3f12c0adf84@mail.gmail.com> 2009/5/29 Xerxes R?nby : > The attached patch fixes the icedtea7 build so that it dont redownload the > cacao tarball on every build when doing make clean; make > > Cheers > Xerxes > > Looks good to me. Please commit with the additional change to ensure the $(TAR) command uses bzip2 compression (tar xjf) as mentioned on IRC. 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 doko at ubuntu.com Fri May 29 06:17:19 2009 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 29 May 2009 15:17:19 +0200 Subject: IcedTea7 1.10 Release Status In-Reply-To: <1243601194.4800.161.camel@hermans.wildebeest.org> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> <4A1F99DF.4040009@ubuntu.com> <4A1FB178.3030902@ubuntu.com> <1243601194.4800.161.camel@hermans.wildebeest.org> Message-ID: <4A1FE05F.4030105@ubuntu.com> Mark Wielaard schrieb: > Hi Matthias, > > On Fri, 2009-05-29 at 11:57 +0200, Matthias Klose wrote: >>>> I am not seeing that failure, but I am seeing: >>>> LOG: [0xb7f346c0] system_mmap_anonymous: mmap failed: Permission denied >>>> Which seems to be caused by the icedtea-cacao-no-mmap-first-page.patch >>>> not being applied. >>> fixed the latter in the repository, using the patch from IcedTea6. > > Thanks! > >> the build is still broken. >> filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=344 >> a build with changeset 1840 succeeds. > > Which changeset is that exactly? 1840 is your local rev number, which > might be different from other people's local rev number. For me 1840 is > caf6ea78c242. yes, 1840:caf6ea78c242 From xerxes at zafena.se Fri May 29 06:26:03 2009 From: xerxes at zafena.se (Xerxes R?nby) Date: Fri, 29 May 2009 13:26:03 +0000 Subject: changeset in /hg/icedtea: 2009-05-29 Xerxes R?nby changeset 9a8c3c90bdb2 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9a8c3c90bdb2 description: 2009-05-29 Xerxes R?nby * Makefile.am (CACAO_SRC_ZIP): changed to download the .tar.bz2 file that matches the CACAO_MD5SUM. (stamps/extract-cacao.stamp): explicit unpack .tar.bz2 using tar xjf. diffstat: 2 files changed, 8 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 4 ++-- diffs (34 lines): diff -r b65dc786ec65 -r 9a8c3c90bdb2 ChangeLog --- a/ChangeLog Fri May 29 10:09:16 2009 +0200 +++ b/ChangeLog Fri May 29 15:28:39 2009 +0200 @@ -1,3 +1,9 @@ 2009-05-29 Matthias Klose + + * Makefile.am (CACAO_SRC_ZIP): changed to download the .tar.bz2 + file that matches the CACAO_MD5SUM. + (stamps/extract-cacao.stamp): explicit unpack .tar.bz2 using tar xjf. + 2009-05-29 Matthias Klose * patches/icedtea-fonts.patch: Update fontconfig for Ubuntu. diff -r b65dc786ec65 -r 9a8c3c90bdb2 Makefile.am --- a/Makefile.am Fri May 29 10:09:16 2009 +0200 +++ b/Makefile.am Fri May 29 15:28:39 2009 +0200 @@ -1769,7 +1769,7 @@ if USE_ALT_CACAO_SRC_ZIP if USE_ALT_CACAO_SRC_ZIP CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) else - CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz + CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 endif stamps/download.stamp: stamps/hgforest.stamp @@ -2236,7 +2236,7 @@ if !USE_SYSTEM_CACAO if ! test -d cacao ; \ then \ mkdir cacao ; \ - $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \ + $(TAR) xjf $(CACAO_SRC_ZIP) -C cacao ; \ dir=$$(basename cacao/cacao-*) ; \ ln -s $$dir cacao/cacao ; \ cd cacao/cacao ; \ From gnu_andrew at member.fsf.org Fri May 29 06:29:43 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 14:29:43 +0100 Subject: IcedTea7 1.10 Release Status In-Reply-To: <4A1FE05F.4030105@ubuntu.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <17c6771e0905281307v2f110b69l5bb05cb5103f9f58@mail.gmail.com> <1243583547.4800.18.camel@hermans.wildebeest.org> <4A1F99DF.4040009@ubuntu.com> <4A1FB178.3030902@ubuntu.com> <1243601194.4800.161.camel@hermans.wildebeest.org> <4A1FE05F.4030105@ubuntu.com> Message-ID: <17c6771e0905290629r262b2d81u1452cf8ba354b878@mail.gmail.com> 2009/5/29 Matthias Klose : > Mark Wielaard schrieb: >> Hi Matthias, >> >> On Fri, 2009-05-29 at 11:57 +0200, Matthias Klose wrote: >>>>> I am not seeing that failure, but I am seeing: >>>>> LOG: [0xb7f346c0] system_mmap_anonymous: mmap failed: Permission denied >>>>> Which seems to be caused by the icedtea-cacao-no-mmap-first-page.patch >>>>> not being applied. >>>> fixed the latter in the repository, using the patch from IcedTea6. >> >> Thanks! >> >>> the build is still broken. >>> filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=344 >>> a build with changeset 1840 succeeds. >> >> Which changeset is that exactly? 1840 is your local rev number, which >> might be different from other people's local rev number. For me 1840 is >> caf6ea78c242. > > yes, 1840:caf6ea78c242 > > I don't see what change since then could have caused the error you have. Some more information would help. -- 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 mark at klomp.org Fri May 29 06:34:29 2009 From: mark at klomp.org (Mark Wielaard) Date: Fri, 29 May 2009 15:34:29 +0200 Subject: IcedTea7 1.10 Release Status In-Reply-To: <17c6771e0905290601v4a982eepc2101ee09e349eae@mail.gmail.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <1243601360.4800.168.camel@hermans.wildebeest.org> <17c6771e0905290601v4a982eepc2101ee09e349eae@mail.gmail.com> Message-ID: <1243604070.4800.229.camel@hermans.wildebeest.org> Hi Andrew, On Fri, 2009-05-29 at 14:01 +0100, Andrew John Hughes wrote: > At the moment, I just want to know whether to cut a 'proper' release > or not, given that CACAO is broken (as regards actually running code) > and unlikely to be fixed soon. Do people still want an IcedTea7 > release for J1? I think we are making great progress and would like to see a release before J1. Would it be an idea to shoot for Monday? That gives people time to double check the current release candidate (is it tagged yet?) and possible fix some issues found. It would be sad if the cacao issue isn't fixed before that, but if IcedTea7 1.10 gets released without that will hopefully give people more incentive to fix for the next one. What release steps remain? Cheers, Mark From gnu_andrew at member.fsf.org Fri May 29 06:52:42 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 14:52:42 +0100 Subject: IcedTea7 1.10 Release Status In-Reply-To: <1243604070.4800.229.camel@hermans.wildebeest.org> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <1243601360.4800.168.camel@hermans.wildebeest.org> <17c6771e0905290601v4a982eepc2101ee09e349eae@mail.gmail.com> <1243604070.4800.229.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905290652k7092e473vd3dfd9a9b5d63633@mail.gmail.com> 2009/5/29 Mark Wielaard : > Hi Andrew, > > On Fri, 2009-05-29 at 14:01 +0100, Andrew John Hughes wrote: >> At the moment, I just want to know whether to cut a 'proper' release >> or not, given that CACAO is broken (as regards actually running code) >> and unlikely to be fixed soon. ?Do people still want an IcedTea7 >> release for J1? > > I think we are making great progress and would like to see a release > before J1. Would it be an idea to shoot for Monday? That gives people > time to double check the current release candidate (is it tagged yet?) > and possible fix some issues found. It would be sad if the cacao issue > isn't fixed before that, but if IcedTea7 1.10 gets released without that > will hopefully give people more incentive to fix for the next one. What > release steps remain? > > Cheers, > > Mark > > Other than CACAO, I'm pretty much good to go. I have a changeset in progress which will fix some issues found during makedistcheck and which renames --enable-liveconnect to --enable-plugin as you suggested. After that, it's just an update to NEWS, etc. It should be possible to do that in what remains of today, and then let people test a branch over the weekend. -- 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 langel at redhat.com Fri May 29 06:56:35 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 29 May 2009 09:56:35 -0400 Subject: IcedTea6 1.5 Released! Message-ID: <4A1FE993.9020101@redhat.com> We are proud to announce the release of IcedTea6 1.5. The IcedTea6 project provides a harness to build the source code from OpenJDK6 (http://openjdk.java.net) using Free Software build tools. What's New? ----------------- - Static trace support through systemtap. When given the configure option --enable-systemtap IcedTea will build hotspot with the dtrace static markers enabled and install an hotspot tapset that can be used to dynamically trace execution of java applications at runtime. See the tapset/hotspot.stp file for documentation of the various trace points and arguments available. - Allow building of other virtual machines besides the default VM. Additional virtual machines on architectures where hotspot is available are cacao and zero (or shark), and cacao, where zero (or shark) is available. It's not possible to build cacao as the default VM, and zero as additional VM. - Update to latest HotSpot minor build (hs14b10-->hs14b15) from the new HotSpot Express repository. - Updated to OpenJDK b16 build. - VisualVM updated to 1.1.1. - Updated to support CACAO 0.99.4. - Several web browser plugin and javaws support fixes: - Fixed security handling to prevent access denials when there is a site specific exception in the policy file - Allow extentions (chrome) to run Java code with full permissions - Added non-trusted SSL support to WebStart (javaws) - Added proxy support - Other improvements that were breaking specific sites (tag parser fix, nested jar support, etc.) - Added JVM Console (used by http://chrispederick.com/work/web-developer/) - Removed gcjwebplugin support. - LCMS security fixes. - Many build improvements. - Many gervill, java2d, nio2, pulse java, zero/shark, jtreg fixes. - Experimental out-of-the-box cross-compilation support (not yet finished) - Other bug fixes. ----------------- The tarball and nosrc RPM can be downloaded here: http://icedtea.classpath.org/download/fedora/java-1.6.0-openjdk-1.6.0.0-21.b16.fc11.nosrc.rpm http://icedtea.classpath.org/download/source/icedtea6-1.5.tar.gz The following people helped with this release: Gary Benson, Deepak Bhole, Andrew Haley, Andrew John Hughes, Tomas Hurka, Ioana Ivan, Mattias Klose, Omair Majid, Xerxes R?nby, Marc Schoenefeld, Robert Schuster, Mark Wielaard, Lillian Angel We would also like to thank the bug reporters and testers! To get started: $ hg clone http://icedtea.classpath.org/hg/release/icedtea6-1.5 $ cd icedtea6-1.5 Full build requirements and instructions are in INSTALL: $ ./configure [--enable-visualvm --with-openjdk --enable-pulse-java --enable-systemtap ...] $ make The new package has been built into Fedora 10, Fedora 11 and Fedora 12 (rawhide) and should appear in the yum repositories in a couple of days. From gnu_andrew at member.fsf.org Fri May 29 07:03:59 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 15:03:59 +0100 Subject: IcedTea6 1.5 Released! In-Reply-To: <4A1FE993.9020101@redhat.com> References: <4A1FE993.9020101@redhat.com> Message-ID: <17c6771e0905290703h5d8de88fufa44f42551c21bf9@mail.gmail.com> 2009/5/29 Lillian Angel : > We are proud to announce the release of IcedTea6 1.5. > > The IcedTea6 project provides a harness to build the source code from > OpenJDK6 (http://openjdk.java.net) using Free Software build tools. > > What's New? > ----------------- > - Static trace support through systemtap. > ?When given the configure option --enable-systemtap IcedTea will build > ?hotspot with the dtrace static markers enabled and install an hotspot > ?tapset that can be used to dynamically trace execution of java > ?applications at runtime. See the tapset/hotspot.stp file for > ?documentation of the various trace points and arguments available. > - Allow building of other virtual machines besides the default VM. > Additional > ?virtual machines on architectures where hotspot is available are cacao > ?and zero (or shark), and cacao, where zero (or shark) is available. It's > ?not possible to build cacao as the default VM, and zero as additional VM. > - Update to latest HotSpot minor build (hs14b10-->hs14b15) from the new > ?HotSpot Express repository. > - Updated to OpenJDK b16 build. > - VisualVM updated to 1.1.1. > - Updated to support CACAO 0.99.4. > - Several web browser plugin and javaws support fixes: > ?- Fixed security handling to prevent access denials when there is a site > ?specific exception in the policy file > ?- Allow extentions (chrome) to run Java code with full permissions > ?- Added non-trusted SSL support to WebStart (javaws) > ?- Added proxy support > ?- Other improvements that were breaking specific sites (tag parser fix, > ? nested jar support, etc.) > ?- Added JVM Console (used by http://chrispederick.com/work/web-developer/) > - Removed gcjwebplugin support. > - LCMS security fixes. > - Many build improvements. > - Many gervill, java2d, nio2, pulse java, zero/shark, jtreg fixes. > - Experimental out-of-the-box cross-compilation support (not yet finished) > - Other bug fixes. > ----------------- > > The tarball and nosrc RPM can be downloaded here: > http://icedtea.classpath.org/download/fedora/java-1.6.0-openjdk-1.6.0.0-21.b16.fc11.nosrc.rpm > http://icedtea.classpath.org/download/source/icedtea6-1.5.tar.gz > > The following people helped with this release: > Gary Benson, Deepak Bhole, Andrew Haley, Andrew John Hughes, Tomas Hurka, > Ioana Ivan, Mattias Klose, Omair Majid, Xerxes R?nby, Marc Schoenefeld, > Robert Schuster, Mark Wielaard, Lillian Angel > > > We would also like to thank the bug reporters and testers! > > To get started: > $ hg clone http://icedtea.classpath.org/hg/release/icedtea6-1.5 > $ cd icedtea6-1.5 > > Full build requirements and instructions are in INSTALL: > $ ./configure [--enable-visualvm --with-openjdk --enable-pulse-java > --enable-systemtap ...] > $ make > > The new package has been built into Fedora 10, Fedora 11 and Fedora 12 > (rawhide) and should appear in the yum repositories in a couple of days. > Congratulations!!! -- 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 ahughes at redhat.com Fri May 29 08:04:08 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 29 May 2009 15:04:08 +0000 Subject: changeset in /hg/icedtea: Fix issues discovered by make distchec... Message-ID: changeset ad579e9833cc in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ad579e9833cc description: Fix issues discovered by make distcheck and rename --enable-liveconnect to --enable-plugin. 2009-05-27 Andrew John Hughes * Makefile.am: Only distribute liveconnect code when either plugin is enabled. Rename netx in the build directory to netx.build to avoid conflicts. Make sure netx is in EXTRA_DIST and build is cleaned up fully. * configure.ac: Rename --enable-liveconnect to --enable-plugin. * patches/icedtea-liveconnect-dist.patch: Split from icedtea-netx.patch to enable conditional use. * patches/icedtea-netx.patch: Recreated without liveconnect distribution. diffstat: 5 files changed, 118 insertions(+), 63 deletions(-) ChangeLog | 15 +++++++ Makefile.am | 37 +++++++++++------ configure.ac | 4 - patches/icedtea-liveconnect-dist.patch | 67 ++++++++++++++++++++++++++++++++ patches/icedtea-netx.patch | 58 ++++----------------------- diffs (331 lines): diff -r 9a8c3c90bdb2 -r ad579e9833cc ChangeLog --- a/ChangeLog Fri May 29 15:28:39 2009 +0200 +++ b/ChangeLog Fri May 29 16:05:14 2009 +0100 @@ -1,3 +1,18 @@ 2009-05-29 Xerxes R??nby + + * Makefile.am: + Only distribute liveconnect code when + either plugin is enabled. Rename netx in the + build directory to netx.build to avoid conflicts. + Make sure netx is in EXTRA_DIST and build is cleaned up + fully. + * configure.ac: + Rename --enable-liveconnect to --enable-plugin. + * patches/icedtea-liveconnect-dist.patch: + Split from icedtea-netx.patch to enable conditional use. + * patches/icedtea-netx.patch: + Recreated without liveconnect distribution. + 2009-05-29 Xerxes R??nby * Makefile.am (CACAO_SRC_ZIP): changed to download the .tar.bz2 diff -r 9a8c3c90bdb2 -r ad579e9833cc Makefile.am --- a/Makefile.am Fri May 29 15:28:39 2009 +0200 +++ b/Makefile.am Fri May 29 16:05:14 2009 +0100 @@ -84,7 +84,8 @@ distclean-local: clean-copy clean-jtreg rm -rf stamps rm -f rt-source-files.txt \ hotspot-tools-source-files.txt \ - extra-source-files.txt + extra-source-files.txt \ + netx-source-files.txt rm -rf bootstrap rm -rf lib rm -rf extra-lib @@ -94,6 +95,7 @@ distclean-local: clean-copy clean-jtreg rm -rf rt/netscape rm -rf visualvm rm -rf netbeans + rm -rf netx.build if ENABLE_PLUGIN rm -f IcedTeaPlugin.o IcedTeaPlugin.so endif @@ -1493,7 +1495,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr IcedTeaPlugin.cc \ IcedTeaNPPlugin.cc \ HACKING $(PULSEAUDIO_SRCS) fsg.sh \ - plugin hotspot.map autogen.sh + plugin $(top_srcdir)/netx hotspot.map autogen.sh # The Binary plugs directory is called jdk1.7.0 for historical reasons. The # name is completely irrelevant; only contains the plugs to build IcedTea. @@ -1568,7 +1570,7 @@ ICEDTEA_ENV = \ "RHINO_JAR=$(RHINO_JAR)" \ "DISTRIBUTION_ID=$(DIST_ID)" \ "ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \ - "ALT_NETX_DIST=$(abs_top_builddir)/netx" \ + "ALT_NETX_DIST=$(abs_top_builddir)/netx.build" \ "ALT_LIVECONNECT_DIST=$(abs_top_builddir)" if WITH_CACAO @@ -1652,7 +1654,7 @@ ICEDTEA_ENV_ECJ = \ "JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \ "JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)" \ "DISABLE_NIMBUS=true" \ - "ALT_NETX_DIST=$(abs_top_builddir)/netx" \ + "ALT_NETX_DIST=$(abs_top_builddir)/netx.build" \ "ALT_LIVECONNECT_DIST=$(abs_top_builddir)" if WITH_CACAO @@ -2125,6 +2127,14 @@ endif endif endif +if ENABLE_PLUGIN +ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch +else +if ENABLE_NPPLUGIN +ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch +endif +endif + stamps/extract.stamp: stamps/download.stamp if OPENJDK_SRC_DIR_FOUND cp -a $(OPENJDK_SRC_DIR) openjdk @@ -2304,12 +2314,13 @@ if ENABLE_NPPLUGIN cp -a $(abs_top_srcdir)/plugin/icedteanp/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/ mkdir -p rt cp -a $(abs_top_srcdir)/plugin/icedteanp/netscape rt/ -endif +else if ENABLE_PLUGIN cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/ mkdir -p rt cp -a $(abs_top_srcdir)/plugin/icedtea/netscape rt/ chmod -R ug+w rt +endif endif clean-patch: @@ -3156,9 +3167,9 @@ netx-source-files.txt: find $(abs_top_srcdir)/netx -name '*.java' | sort > $@ stamps/netx.stamp: netx-source-files.txt stamps/hotspot-tools.stamp - mkdir -p $(abs_top_builddir)/netx + mkdir -p $(abs_top_builddir)/netx.build $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \ - -d $(abs_top_builddir)/netx \ + -d $(abs_top_builddir)/netx.build \ -source 1.5 \ -classpath $(abs_top_builddir)/lib/hotspot-tools \ -sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \ @@ -3168,13 +3179,15 @@ stamps/netx.stamp: netx-source-files.txt touch stamps/netx.stamp stamps/netx-dist.stamp: stamps/netx.stamp - (cd $(abs_top_builddir)/netx ; \ + (cd $(abs_top_builddir)/netx.build ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \ - cd $(abs_top_srcdir)/netx ; \ - $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx/lib/classes.jar \ + cp -a $(abs_top_srcdir)/netx src; \ + find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ + cd src ; \ + $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \ `find . -type f -not -name '*.java'` ; \ - $(ZIP) -qr $(abs_top_builddir)/netx/lib/src.zip javax net ) + $(ZIP) -qr $(abs_top_builddir)/netx.build/lib/src.zip javax net ) mkdir -p stamps touch stamps/netx-dist.stamp @@ -3575,7 +3588,7 @@ jtregcheck: jtreg check-hotspot check-la $(jtreg_processes); \ fi -check-local: jtregcheck +#check-local: jtregcheck # VisualVM diff -r 9a8c3c90bdb2 -r ad579e9833cc configure.ac --- a/configure.ac Fri May 29 15:28:39 2009 +0200 +++ b/configure.ac Fri May 29 16:05:14 2009 +0100 @@ -154,8 +154,8 @@ AC_MSG_RESULT(${enable_visualvm}) AC_MSG_RESULT(${enable_visualvm}) AC_MSG_CHECKING([whether to build the LiveConnect plugin]) -AC_ARG_ENABLE([liveconnect], - [AS_HELP_STRING([--disable-liveconnect], +AC_ARG_ENABLE([plugin], + [AS_HELP_STRING([--disable-plugin], [Disable compilation of browser plugin])], [enable_plugin="${enableval}"], [enable_plugin="yes"]) AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes") diff -r 9a8c3c90bdb2 -r ad579e9833cc patches/icedtea-liveconnect-dist.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-liveconnect-dist.patch Fri May 29 16:05:14 2009 +0100 @@ -0,0 +1,67 @@ +diff -Nru openjdk2.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk2/jdk/make/common/internal/Defs-liveconnect.gmk +--- openjdk2.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk2/jdk/make/common/internal/Defs-liveconnect.gmk 2009-05-28 09:18:45.000000000 +0100 +@@ -0,0 +1,27 @@ ++# ++# Copyright 2009 Red Hat, Inc. All Rights Reserved. ++# 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. Red Hat designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Sun in the LICENSE file that accompanied this code. ++# ++# 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. ++# ++ ++# The specific packages that come from or go to rt.jar and tools.jar ++IMPORT_RT_PACKAGES += \ ++ netscape/javascript ++ ++IMPORT_TOOLS_PACKAGES += ++ +diff -Nru openjdk2.orig/jdk/make/common/internal/ImportComponents.gmk openjdk2/jdk/make/common/internal/ImportComponents.gmk +--- openjdk2.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 ++++ openjdk2/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:11:58.000000000 +0100 +@@ -46,6 +46,9 @@ + ifndef JAXWS_DIST + include $(BUILDDIR)/common/internal/Defs-jaxws.gmk + endif ++ifndef LIVECONNECT_DIST ++ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk ++endif + + # Clean up these lists so empty lists are empty + IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) +@@ -157,6 +160,7 @@ + $(call import-one-classes,CORBA_DIST,$1) + $(call import-one-classes,JAXP_DIST,$1) + $(call import-one-classes,JAXWS_DIST,$1) ++$(call import-one-classes,LIVECONNECT_DIST,$1) + endef + + # Clean up import files +diff -Nru openjdk2.orig/jdk/make/common/shared/Defs.gmk openjdk2/jdk/make/common/shared/Defs.gmk +--- openjdk2.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 ++++ openjdk2/jdk/make/common/shared/Defs.gmk 2009-05-29 02:12:06.000000000 +0100 +@@ -344,6 +344,11 @@ + else + JAXWS_DIST = + endif ++ifdef ALT_LIVECONNECT_DIST ++ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) ++else ++ LIVECONNECT_DIST = ++endif + + # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation + ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH diff -r 9a8c3c90bdb2 -r ad579e9833cc patches/icedtea-netx.patch --- a/patches/icedtea-netx.patch Fri May 29 15:28:39 2009 +0200 +++ b/patches/icedtea-netx.patch Fri May 29 16:05:14 2009 +0100 @@ -1,37 +1,6 @@ diff -Nru openjdk.orig/jdk/make/common/i -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-05-28 03:24:40.000000000 +0100 -@@ -0,0 +1,27 @@ -+# -+# Copyright 2009 Red Hat, Inc. All Rights Reserved. -+# 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. Red Hat designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# 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. -+# -+ -+# The specific packages that come from or go to rt.jar and tools.jar -+IMPORT_RT_PACKAGES += \ -+ netscape/javascript -+ -+IMPORT_TOOLS_PACKAGES += -+ diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk --- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 00:58:47.000000000 +0100 ++++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 @@ -0,0 +1,38 @@ +# +# Copyright 2009 Red Hat, Inc. All Rights Reserved. @@ -72,22 +41,19 @@ diff -Nru openjdk.orig/jdk/make/common/i +IMPORT_TOOLS_PACKAGES += + diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-28 00:50:28.000000000 +0100 -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-28 03:23:51.000000000 +0100 -@@ -46,6 +46,12 @@ +--- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 ++++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 +@@ -46,6 +46,9 @@ ifndef JAXWS_DIST include $(BUILDDIR)/common/internal/Defs-jaxws.gmk endif +ifndef NETX_DIST + include $(BUILDDIR)/common/internal/Defs-netx.gmk +endif -+ifndef LIVECONNECT_DIST -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk -+endif # Clean up these lists so empty lists are empty IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) -@@ -119,6 +125,7 @@ +@@ -119,6 +122,7 @@ $(call import-one-sources,CORBA_DIST,$1) $(call import-one-sources,JAXP_DIST,$1) $(call import-one-sources,JAXWS_DIST,$1) @@ -95,19 +61,18 @@ diff -Nru openjdk.orig/jdk/make/common/i endef # Import all component docs into directory $1 (optional) -@@ -157,6 +164,8 @@ +@@ -157,6 +161,7 @@ $(call import-one-classes,CORBA_DIST,$1) $(call import-one-classes,JAXP_DIST,$1) $(call import-one-classes,JAXWS_DIST,$1) +$(call import-one-classes,NETX_DIST,$1) -+$(call import-one-classes,LIVECONNECT_DIST,$1) endef # Clean up import files diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-28 01:00:54.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-28 03:23:06.000000000 +0100 -@@ -344,6 +344,16 @@ +--- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 +@@ -344,6 +344,11 @@ else JAXWS_DIST = endif @@ -116,11 +81,6 @@ diff -Nru openjdk.orig/jdk/make/common/s +else + NETX_DIST = +endif -+ifdef ALT_LIVECONNECT_DIST -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) -+else -+ LIVECONNECT_DIST = -+endif # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH From ahughes at redhat.com Fri May 29 08:08:28 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 29 May 2009 15:08:28 +0000 Subject: changeset in /hg/icedtea: Re-enable jtregcheck! Message-ID: changeset f67799fce886 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f67799fce886 description: Re-enable jtregcheck! diffstat: 1 file changed, 1 insertion(+), 1 deletion(-) Makefile.am | 2 +- diffs (12 lines): diff -r ad579e9833cc -r f67799fce886 Makefile.am --- a/Makefile.am Fri May 29 16:05:14 2009 +0100 +++ b/Makefile.am Fri May 29 16:09:12 2009 +0100 @@ -3588,7 +3588,7 @@ jtregcheck: jtreg check-hotspot check-la $(jtreg_processes); \ fi -#check-local: jtregcheck +check-local: jtregcheck # VisualVM From bugzilla-daemon at icedtea.classpath.org Fri May 29 08:48:02 2009 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 May 2009 15:48:02 +0000 Subject: [Bug 320] daylight savings time status not reported correctly Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=320 ------- Comment #3 from bwitt at bart.gov 2009-05-29 15:48 ------- What's ZONE set to in /etc/sysconfig/clock? I suspect it is ZONE="America/New York" (or something with a space) Replace that space with an underscore to fix the problem. ZONE="America/New_York" Please see: https://bugzilla.redhat.com/show_bug.cgi?id=489586 -- 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 ahughes at redhat.com Fri May 29 08:50:51 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 29 May 2009 15:50:51 +0000 Subject: changeset in /hg/icedtea: Fix liveconnect-dist.patch, needs to b... Message-ID: changeset d552def09688 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d552def09688 description: Fix liveconnect-dist.patch, needs to be against files with netx.patch applied. 2009-05-27 Andrew John Hughes * patches/icedtea-liveconnect-dist.patch: Recreated with netx.patch applied. diffstat: 2 files changed, 21 insertions(+), 16 deletions(-) ChangeLog | 5 +++++ patches/icedtea-liveconnect-dist.patch | 32 ++++++++++++++++---------------- diffs (72 lines): diff -r f67799fce886 -r d552def09688 ChangeLog --- a/ChangeLog Fri May 29 16:09:12 2009 +0100 +++ b/ChangeLog Fri May 29 16:52:00 2009 +0100 @@ -1,3 +1,8 @@ 2009-05-27 Andrew John Hughes + + * patches/icedtea-liveconnect-dist.patch: + Recreated with netx.patch applied. + 2009-05-27 Andrew John Hughes * Makefile.am: diff -r f67799fce886 -r d552def09688 patches/icedtea-liveconnect-dist.patch --- a/patches/icedtea-liveconnect-dist.patch Fri May 29 16:09:12 2009 +0100 +++ b/patches/icedtea-liveconnect-dist.patch Fri May 29 16:52:00 2009 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk2.orig/jdk/make/common/ -diff -Nru openjdk2.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk2/jdk/make/common/internal/Defs-liveconnect.gmk ---- openjdk2.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk2/jdk/make/common/internal/Defs-liveconnect.gmk 2009-05-28 09:18:45.000000000 +0100 +diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk +--- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-05-29 16:49:35.000000000 +0100 @@ -0,0 +1,27 @@ +# +# Copyright 2009 Red Hat, Inc. All Rights Reserved. @@ -29,12 +29,12 @@ diff -Nru openjdk2.orig/jdk/make/common/ + +IMPORT_TOOLS_PACKAGES += + -diff -Nru openjdk2.orig/jdk/make/common/internal/ImportComponents.gmk openjdk2/jdk/make/common/internal/ImportComponents.gmk ---- openjdk2.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 -+++ openjdk2/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:11:58.000000000 +0100 -@@ -46,6 +46,9 @@ - ifndef JAXWS_DIST - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk +diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk +--- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 16:48:26.000000000 +0100 ++++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 16:50:02.000000000 +0100 +@@ -49,6 +49,9 @@ + ifndef NETX_DIST + include $(BUILDDIR)/common/internal/Defs-netx.gmk endif +ifndef LIVECONNECT_DIST + include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk @@ -42,20 +42,20 @@ diff -Nru openjdk2.orig/jdk/make/common/ # Clean up these lists so empty lists are empty IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) -@@ -157,6 +160,7 @@ - $(call import-one-classes,CORBA_DIST,$1) +@@ -162,6 +165,7 @@ $(call import-one-classes,JAXP_DIST,$1) $(call import-one-classes,JAXWS_DIST,$1) + $(call import-one-classes,NETX_DIST,$1) +$(call import-one-classes,LIVECONNECT_DIST,$1) endef # Clean up import files -diff -Nru openjdk2.orig/jdk/make/common/shared/Defs.gmk openjdk2/jdk/make/common/shared/Defs.gmk ---- openjdk2.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 -+++ openjdk2/jdk/make/common/shared/Defs.gmk 2009-05-29 02:12:06.000000000 +0100 -@@ -344,6 +344,11 @@ +diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk +--- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 16:48:26.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 16:49:35.000000000 +0100 +@@ -349,6 +349,11 @@ else - JAXWS_DIST = + NETX_DIST = endif +ifdef ALT_LIVECONNECT_DIST + LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) From gnu_andrew at member.fsf.org Fri May 29 09:06:59 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 17:06:59 +0100 Subject: IcedTea7 1.10 Release Status In-Reply-To: <17c6771e0905290652k7092e473vd3dfd9a9b5d63633@mail.gmail.com> References: <17c6771e0905281112l34292834h8a1beb9255cb566b@mail.gmail.com> <1243601360.4800.168.camel@hermans.wildebeest.org> <17c6771e0905290601v4a982eepc2101ee09e349eae@mail.gmail.com> <1243604070.4800.229.camel@hermans.wildebeest.org> <17c6771e0905290652k7092e473vd3dfd9a9b5d63633@mail.gmail.com> Message-ID: <17c6771e0905290906l79992f98s968ebf207eaea09@mail.gmail.com> 2009/5/29 Andrew John Hughes : > 2009/5/29 Mark Wielaard : >> Hi Andrew, >> >> On Fri, 2009-05-29 at 14:01 +0100, Andrew John Hughes wrote: >>> At the moment, I just want to know whether to cut a 'proper' release >>> or not, given that CACAO is broken (as regards actually running code) >>> and unlikely to be fixed soon. ?Do people still want an IcedTea7 >>> release for J1? >> >> I think we are making great progress and would like to see a release >> before J1. Would it be an idea to shoot for Monday? That gives people >> time to double check the current release candidate (is it tagged yet?) >> and possible fix some issues found. It would be sad if the cacao issue >> isn't fixed before that, but if IcedTea7 1.10 gets released without that >> will hopefully give people more incentive to fix for the next one. What >> release steps remain? >> >> Cheers, >> >> Mark >> >> > > Other than CACAO, I'm pretty much good to go. ?I have a changeset in > progress which will fix some issues found during makedistcheck and > which renames --enable-liveconnect to --enable-plugin as you > suggested. ?After that, it's just an update to NEWS, etc. ?It should > be possible to do that in what remains of today, and then let people > test a branch over the weekend. > -- > 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 > Ok, everything looks ready here and after speaking to doko on IRC about CACAO, we've agreed that it isn't a blocker for the release (although we'd of course like to see it fixed). I'm going to do a final make distcheck and use the resulting tarball as icedtea 1.10 (following by the appropriate tagging and branch process). If anyone has any major objections, please scream now. -- 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 ahughes at redhat.com Fri May 29 09:06:21 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 29 May 2009 16:06:21 +0000 Subject: changeset in /hg/icedtea: Update documentation prior to release. Message-ID: changeset 8ae4bc2b6c1d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8ae4bc2b6c1d description: Update documentation prior to release. 2009-05-27 Andrew John Hughes * NEWS: Add IcedTea7 1.10 release notes. * README: Updated. Remove notes on binary plugs which are no longer an issue. Highlight the addition of javaws, plugin and additional architecture support by IcedTea. diffstat: 3 files changed, 63 insertions(+), 75 deletions(-) ChangeLog | 10 ++++++ NEWS | 29 ++++++++++++++++- README | 99 ++++++++++++++++--------------------------------------------- diffs (208 lines): diff -r d552def09688 -r 8ae4bc2b6c1d ChangeLog --- a/ChangeLog Fri May 29 16:52:00 2009 +0100 +++ b/ChangeLog Fri May 29 17:04:53 2009 +0100 @@ -1,3 +1,13 @@ 2009-05-27 Andrew John Hughes + + * NEWS: + Add IcedTea7 1.10 release notes. + * README: + Updated. Remove notes on binary plugs which + are no longer an issue. Highlight the addition + of javaws, plugin and additional architecture support + by IcedTea. + 2009-05-27 Andrew John Hughes * patches/icedtea-liveconnect-dist.patch: diff -r d552def09688 -r 8ae4bc2b6c1d NEWS --- a/NEWS Fri May 29 16:52:00 2009 +0100 +++ b/NEWS Fri May 29 17:04:53 2009 +0100 @@ -1,5 +1,7 @@ New in release 1.10 (XXXX-XX-XX) -New in release 1.10 (XXXX-XX-XX) - +New in release 1.10 (2009-05-29) + +- Updated to OpenJDK7 b59 build via IcedTea forest. Now includes + SCTP and Nimbus Swing look and feel. - Static trace support through systemtap. When given the configure option --enable-systemtap IcedTea will build hotspot with the dtrace static markers enabled and install an hotspot @@ -10,6 +12,28 @@ New in release 1.10 (XXXX-XX-XX) virtual machines on architectures where hotspot is available are cacao and zero (or shark), and cacao, where zero (or shark) is available. It's not possible to build cacao as the default VM, and zero as additional VM. +- New options --enable-nimbus and --enable-nimbus-generation. The default + is that the first is on but the second is off, so Nimbus is built but + without needing to generate the files using JIBX (http://jibx.sourceforge.net/). +- VisualVM updated to 1.1.1. +- Many build fixes, notably to make netx/the plugin work. IcedTea7 now + avoids the binary plug mechanism in favour of using the same method as + CORBA, JAXP, JAXWS and langtools to import the plugin/netx code. +- Several web browser plugin and javaws support fixes: + - Fixed security handling to prevent access denials when there is a site + specific exception in the policy file + - Allow extensions (chrome) to run Java code with full permissions + - Added non-trusted SSL support to WebStart (javaws) + - Added proxy support + - Other improvements that were breaking specific sites (tag parser fix, + nested jar support, etc.) + - Added JVM Console (used by http://chrispederick.com/work/web-developer/) + - Experimental new plugin enabled by --enable-npplugin. + - Original plugin is now enabled by --enable-plugin, not --enable-liveconnect. +- LCMS security fixes. +- Many build improvements. +- Many zero/shark jtreg fixes. +- Other bug fixes. New in release 1.9 (2009-03-20) @@ -55,6 +79,7 @@ New in release 1.9 (2009-03-20) or hg revision (--with-openjdk-src-dir or --with-hg-revision). - Many other Plugin, Zero, Shark and PulseAudio bug fixes. - Build clean up. +- Updated to CACAO 0.99.4. New in release 1.8 (2008-11-20) diff -r d552def09688 -r 8ae4bc2b6c1d README --- a/README Fri May 29 16:52:00 2009 +0100 +++ b/README Fri May 29 17:04:53 2009 +0100 @@ -5,23 +5,12 @@ openjdk.java.net using Free Software too openjdk.java.net using Free Software tools and dependencies. IcedTea addresses two problems: it eliminates the build requirement on -proprietary build tools and it provides replacements for the -"encumbered binary plugs". +proprietary build tools and it provides implementations of Java Web Start +and the browser plugin which are missing from OpenJDK. It also provides +support for additional architectures via Zero/Shark. -These plugs are described at http://openjdk.java.net: "Not all of the -source code that makes up the JDK is available under an open-source -license. In order to build an OpenJDK binary from source code, you -must first download and install one or more of the following files -from which the build process will copy over 'binary plugs' for these -encumbered components." - -This project uses code from GNU Classpath, code generated during a -build of the openjdk.java.net source code, and stub code written by -Red Hat, to provide Free Software replacements for these encumbered -binary plugs. - -IcedTea also provides build scripts and patches that allow the source -code from openjdk.java.net to be built with IcedTea itself. +IcedTea also provides build scripts and patches that fix a number of issues +which are as yet unresolved upstream. See INSTALL for build instructions. @@ -56,16 +45,6 @@ portable interpreter for ppc and ppc64 s portable interpreter for ppc and ppc64 support, plugin support and Web Start support. -How the Stub Replacements were Produced ---------------------------------------- - -To produce the plug replacements, we began by satisfying as many -undefined references as possible using code from a completed build of -the source code from openjdk.java.net. Then we supplemented the -resultant tree with more replacement code from GNU Classpath. -Following that, we fixed each remaining build error by creating the -simplest possible stub code. - A Note About License Headers ---------------------------- @@ -85,57 +64,32 @@ license header. Instances are: openjdk/jdk/src/share/classes/**/resources/*.properties -gcjwebplugin -============ +Web Browser Plugin support +=========================== -gcjwebplugin provides basic support for running applets in -Mozilla-based web browsers. It does not support applet/Javascript -communication (LiveConnect) and support for signed applets needs -further testing. The current applet security manager may be too -strict and may require tuning to allow otherwise-legitimate calls by -untrusted applets. +The default web browser plugin has LiveConnect support. It will only +build against a recent version of XULRunner, such as that available in +Fedora Rawhide as of 2008-05-16. The required development headers are +provided by the xulrunner-devel package. -gcjwebplugin itself is a shared object, gcjwebplugin.so, built from a -single source file, gcjwebplugin.cc. The IcedTea adaptation of -gcjwebplugin communicates through named pipes with a modified version -of IcedTea's appletviewer. Two source files, -openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java, -openjdk/jdk/src/share/classes/sun/applet/PluginMain.java are added to -rt.jar and tools.jar to provide gcjwebplugin with an interface into -the appletviewer code. This support code is provided in -patches/icedtea-webservices.patch. +A new plugin is being developed to support the new Mozilla API changes. It can +be enabled with the option --enable-npplugin, and it is based on gcjwebplugin. +At the moment there is no liveconnect support for it. -If the option --enable-netx-plugin is passed to configure, this will -make all applets run through NetX security instead of the default -security manager. This feature is experimental, and is not enabled by -default. Note that if --disable-gcjwebplugin is used, --enable-netx-plugin -will not work. +NetX +==== -Experimental LiveConnect support -================================ +NetX provides a drop-in replacement for javaws (Java Web Start). Since +upstream NetX is dormant, we will be hosting and modifying the sources +in the IcedTea repository, particularly in the netx/net/sourceforge/jnlp +directory. -The configure option --enable-liveconnect enables experimental -LiveConnect support, implemented by IcedTeaPlugin.cc and -patches/icedtea-liveconnect.patch. Currently IcedTeaPlugin.cc will -only build against a very recent version of XULRunner, such as that -available in Fedora Rawhide as of 2008-02-23. The required -development headers are provided by the xulrunner-devel package. +The NetX sources are built into rt.jar using the same method as +CORBA, JAXWS, JAXP and langtools. -To run IcedTeaPlugin you'll need to add -/usr/lib/xulrunner-sdk-1.9pre/sdk/lib/ to LD_LIBRARY_PATH. - -Experimental LiveConnect support -================================ - -The configure option --enable-liveconnect enables experimental -LiveConnect support, implemented by IcedTeaPlugin.cc and -patches/icedtea-liveconnect.patch. Currently IcedTeaPlugin.cc will -only build against a very recent version of XULRunner, such as that -available in Fedora Rawhide as of 2008-02-23. The required -development headers are provided by the xulrunner-devel package. - -To run IcedTeaPlugin you'll need to add -/usr/lib/xulrunner-sdk-1.9pre/sdk/lib/ to LD_LIBRARY_PATH. +IcedTea's NetX currently supports verification of signed jars, trusted +certificate storing, system certificate store checking, and provides +the services specified by the jnlp API. NetX ==== @@ -157,12 +111,11 @@ The --with-cacao configure option replac The --with-cacao configure option replaces the libjvm.so from Sun's HotSpot with the one from the CACAO VM. This enables the usage of IcedTea on architectures which are not supported by the HotSpot VM, -besides the HotSpot zero port. In contrast to the HotSpot zero port, +besides the HotSpot zero port. In contrast to the HotSpot Zero port, CACAO provides a Just-In-Time compiler for various architectures. The environment variable CACAO_CONFIGURE_ARGS can be used to pass additional arguments to the cacao configure. - PulseAudio Mixer ================ From ahughes at redhat.com Fri May 29 09:10:06 2009 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 29 May 2009 16:10:06 +0000 Subject: changeset in /hg/icedtea: Bump to 1.10, remove the netx alias ta... Message-ID: changeset 9729b3a51305 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9729b3a51305 description: Bump to 1.10, remove the netx alias target as it conflicts with the directory. 2009-05-27 Andrew John Hughes * Makefile.am: Remove netx target as conflicts with directory when building in the source tree. * configure.ac: Bump to 1.10 proper. diffstat: 3 files changed, 9 insertions(+), 3 deletions(-) ChangeLog | 8 ++++++++ Makefile.am | 2 -- configure.ac | 2 +- diffs (36 lines): diff -r 8ae4bc2b6c1d -r 9729b3a51305 ChangeLog --- a/ChangeLog Fri May 29 17:04:53 2009 +0100 +++ b/ChangeLog Fri May 29 17:11:17 2009 +0100 @@ -1,3 +1,11 @@ 2009-05-27 Andrew John Hughes + + * Makefile.am: + Remove netx target as conflicts with + directory when building in the source tree. + * configure.ac: + Bump to 1.10 proper. + 2009-05-27 Andrew John Hughes * NEWS: diff -r 8ae4bc2b6c1d -r 9729b3a51305 Makefile.am --- a/Makefile.am Fri May 29 17:04:53 2009 +0100 +++ b/Makefile.am Fri May 29 17:11:17 2009 +0100 @@ -3739,8 +3739,6 @@ clean: distclean-local jtreg: stamps/jtreg.stamp -netx: stamps/netx.stamp - netx-dist: stamps/netx-dist.stamp liveconnect: stamps/liveconnect.stamp diff -r 8ae4bc2b6c1d -r 9729b3a51305 configure.ac --- a/configure.ac Fri May 29 17:04:53 2009 +0100 +++ b/configure.ac Fri May 29 17:11:17 2009 +0100 @@ -1,4 +1,4 @@ AC_INIT([icedtea], [1.10-pre], [distro-p -AC_INIT([icedtea], [1.10-pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [1.10], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From omajid at redhat.com Fri May 29 09:13:51 2009 From: omajid at redhat.com (Omair Majid) Date: Fri, 29 May 2009 16:13:51 +0000 Subject: changeset in /hg/icedtea6: 2009-05-29 Omair Majid changeset 6b95c888541f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6b95c888541f description: 2009-05-29 Omair Majid * rt/net/sourceforge/jnlp/JREDesc.java: Change initialHeapSize and maximumHeapSize to String. (JREDesc): Check and store initialHeapSize and maximumHeapSize. Throw ParseException on error. (getMaximumHeapSize): Return String. (getInitialHeapSize): Likewise. (heapToLong): Renamed to... (checkHeapSize): New method. Check for valid heap size. * rt/net/sourceforge/jnlp/resources/Messages.properties: Add PBadHeapSize to indicate a bad heap size. diffstat: 3 files changed, 55 insertions(+), 11 deletions(-) ChangeLog | 13 ++++ rt/net/sourceforge/jnlp/JREDesc.java | 52 +++++++++++++---- rt/net/sourceforge/jnlp/resources/Messages.properties | 1 diffs (134 lines): diff -r e3339b19c3d9 -r 6b95c888541f ChangeLog --- a/ChangeLog Fri May 29 12:38:51 2009 +0100 +++ b/ChangeLog Fri May 29 12:13:53 2009 -0400 @@ -1,3 +1,16 @@ 2009-05-29 Gary Benson + + * rt/net/sourceforge/jnlp/JREDesc.java: + Change initialHeapSize and maximumHeapSize to String. + (JREDesc): Check and store initialHeapSize and maximumHeapSize. Throw + ParseException on error. + (getMaximumHeapSize): Return String. + (getInitialHeapSize): Likewise. + (heapToLong): Renamed to... + (checkHeapSize): New method. Check for valid heap size. + * rt/net/sourceforge/jnlp/resources/Messages.properties: Add PBadHeapSize + to indicate a bad heap size. + 2009-05-29 Gary Benson * ports/hotspot/src/share/vm/shark/sharkBlock.hpp diff -r e3339b19c3d9 -r 6b95c888541f rt/net/sourceforge/jnlp/JREDesc.java --- a/rt/net/sourceforge/jnlp/JREDesc.java Fri May 29 12:38:51 2009 +0100 +++ b/rt/net/sourceforge/jnlp/JREDesc.java Fri May 29 12:13:53 2009 -0400 @@ -21,6 +21,8 @@ import java.net.*; import java.net.*; import java.util.*; +import net.sourceforge.jnlp.runtime.JNLPRuntime; + /** * The J2SE/Java element. * @@ -36,10 +38,10 @@ public class JREDesc { private URL location; /** inital heap size */ - private long initialHeapSize; + private String initialHeapSize; /** maximum head size */ - private long maximumHeapSize; + private String maximumHeapSize; /** args to pass to the vm */ private String vmArgs; @@ -60,12 +62,14 @@ public class JREDesc { */ public JREDesc(Version version, URL location, String vmArgs, String initialHeapSize, - String maximumHeapSize, List resources) { + String maximumHeapSize, List resources) throws ParseException { this.version = version; this.location = location; this.vmArgs = vmArgs; - this.initialHeapSize = heapToLong(initialHeapSize); - this.maximumHeapSize = heapToLong(maximumHeapSize); + checkHeapSize(initialHeapSize); + this.initialHeapSize = initialHeapSize; + checkHeapSize(maximumHeapSize); + this.maximumHeapSize = maximumHeapSize; this.resources = resources; } @@ -97,14 +101,14 @@ public class JREDesc { /** * Returns the maximum heap size in bytes. */ - public long getMaximumHeapSize() { + public String getMaximumHeapSize() { return maximumHeapSize; } /** * Returns the initial heap size in bytes. */ - public long getInitialHeapSize() { + public String getInitialHeapSize() { return initialHeapSize; } @@ -123,12 +127,38 @@ public class JREDesc { } /** - * Convert a heap size description string to a long value - * indicating the heap min/max size. + * Check for valid heap size string + * @throws ParseException if heapSize is invalid */ - static private long heapToLong(String heapSize) { + static private void checkHeapSize(String heapSize) throws ParseException { // need to implement for completeness even though not used in netx - return -1; + if (heapSize == null) { + return; + } + + boolean lastCharacterIsDigit = true; + // the last character must be 0-9 or k/K/m/M + char lastChar = Character.toLowerCase(heapSize.charAt(heapSize.length()-1)); + if ((lastChar < '0' || lastChar > '9')) { + lastCharacterIsDigit = false; + if (lastChar != 'k' && lastChar!= 'm' ) { + throw new ParseException(JNLPRuntime.getMessage("PBadHeapSize",new Object[] {heapSize})); + } + } + + int indexOfLastDigit = heapSize.length() - 1; + if (!lastCharacterIsDigit) { + indexOfLastDigit = indexOfLastDigit - 1; + } + + String size = heapSize.substring(0,indexOfLastDigit); + try { + // check that the number is a number! + Integer.valueOf(size); + } catch (NumberFormatException numberFormat) { + throw new ParseException(JNLPRuntime.getMessage("PBadHeapSize", new Object[] {heapSize}), numberFormat); + } + } } diff -r e3339b19c3d9 -r 6b95c888541f rt/net/sourceforge/jnlp/resources/Messages.properties --- a/rt/net/sourceforge/jnlp/resources/Messages.properties Fri May 29 12:38:51 2009 +0100 +++ b/rt/net/sourceforge/jnlp/resources/Messages.properties Fri May 29 12:13:53 2009 -0400 @@ -88,6 +88,7 @@ PBadNonrelativeUrl=Invalid non-relative PBadNonrelativeUrl=Invalid non-relative URL (node={0}, href={0}). PNeedsAttribute=The {0} element must specify a {1} attribute. PBadXML=Invalid XML document syntax. +PBadHeapSize=Invalid value for heap size ({0}) # Runtime BLaunchAbout=Launching about window... From gnu_andrew at member.fsf.org Fri May 29 09:39:04 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 17:39:04 +0100 Subject: IcedTea 1.10 released! Message-ID: <17c6771e0905290939w1f8a8d8jd518df5e2919d62b@mail.gmail.com> We are proud to announce the release of IcedTea 1.10. The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools, along with a number of additional features: * Plugin support * javaws support via netx * Multiple architecture support via Zero/Shark What's New? ----------------- - Updated to OpenJDK7 b59 build via IcedTea forest. Now includes SCTP and Nimbus Swing look and feel. - Static trace support through systemtap. When given the configure option --enable-systemtap IcedTea will build hotspot with the dtrace static markers enabled and install an hotspot tapset that can be used to dynamically trace execution of java applications at runtime. See the tapset/hotspot.stp file for documentation of the various trace points and arguments available. - Allow building of other virtual machines besides the default VM. Additional virtual machines on architectures where hotspot is available are cacao and zero (or shark), and cacao, where zero (or shark) is available. It's not possible to build cacao as the default VM, and zero as additional VM. - New options --enable-nimbus and --enable-nimbus-generation. The default is that the first is on but the second is off, so Nimbus is built but without needing to generate the files using JIBX (http://jibx.sourceforge.net/). - VisualVM updated to 1.1.1. - Many build fixes, notably to make netx/the plugin work. IcedTea7 now avoids the binary plug mechanism in favour of using the same method as CORBA, JAXP, JAXWS and langtools to import the plugin/netx code. - Several web browser plugin and javaws support fixes: - Fixed security handling to prevent access denials when there is a site specific exception in the policy file - Allow extensions (chrome) to run Java code with full permissions - Added non-trusted SSL support to WebStart (javaws) - Added proxy support - Other improvements that were breaking specific sites (tag parser fix, nested jar support, etc.) - Added JVM Console (used by http://chrispederick.com/work/web-developer/) - Experimental new plugin enabled by --enable-npplugin. - Original plugin is now enabled by --enable-plugin, not --enable-liveconnect. - LCMS security fixes. - Many build improvements. - Many zero/shark jtreg fixes. - Other bug fixes. ----------------- The tarball can be found here: http://icedtea.classpath.org/download/source/icedtea-1.10.tar.gz Thanks to Lillian Angel, Fedora RPMs will shortly be available from: http://langel.fedorapeople.org/java-1.7.0-openjdk/ Ubuntu packages will also be available shortly; Matthias Klose will provide further information via e-mail when this occurs. The following people helped with this release: Lillian Angel, Gary Benson, Deepak Bhole, Andrew Haley, Andrew John Hughes, Ioana Ivan, Matthias Klose, Omair Majid, Xerxes R?nby, Robert Schuster, Mark Wielaard We would also like to thank all the bug reporters and testers! To get started: $ hg clone http://icedtea.classpath.org/hg/release/icedtea-1.10 $ cd icedtea-1.10 Full build requirements and instructions are in INSTALL: $ ./configure [--enable-visualvm --with-openjdk --enable-pulse-java --enable-systemtap --enable-zero --enable-shark...] $ make If you're packaging 1.10 for your distro, now is the time to start your engines! -- 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 Fri May 29 09:49:40 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 29 May 2009 16:49:40 +0000 Subject: changeset in /hg/icedtea: Added tag icedtea-1.10 for changeset 9... Message-ID: changeset d6a26e712b1a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d6a26e712b1a description: Added tag icedtea-1.10 for changeset 9729b3a51305 diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r 9729b3a51305 -r d6a26e712b1a .hgtags --- a/.hgtags Fri May 29 17:11:17 2009 +0100 +++ b/.hgtags Fri May 29 17:46:17 2009 +0100 @@ -15,3 +15,4 @@ 6c02b699206db299c6bc96d97d31808bf84f042a 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 db666234267c53adb4f55967fa3dce442167ae3b icedtea-1.9 +9729b3a513055efc33f1220e3c8cd372afdf74d9 icedtea-1.10 From langel at redhat.com Fri May 29 13:46:39 2009 From: langel at redhat.com (Lillian Angel) Date: Fri, 29 May 2009 16:46:39 -0400 Subject: IcedTea 1.10 released! In-Reply-To: <17c6771e0905290939w1f8a8d8jd518df5e2919d62b@mail.gmail.com> References: <17c6771e0905290939w1f8a8d8jd518df5e2919d62b@mail.gmail.com> Message-ID: <4A2049AF.9090004@redhat.com> Andrew John Hughes wrote: > We are proud to announce the release of IcedTea 1.10. > > The IcedTea project provides a harness to build the source code from > OpenJDK (http://openjdk.java.net) using Free Software build tools, > along with a number of additional features: > > * Plugin support > * javaws support via netx > * Multiple architecture support via Zero/Shark > > What's New? > ----------------- > - Updated to OpenJDK7 b59 build via IcedTea forest. Now includes > SCTP and Nimbus Swing look and feel. > - Static trace support through systemtap. > When given the configure option --enable-systemtap IcedTea will build > hotspot with the dtrace static markers enabled and install an hotspot > tapset that can be used to dynamically trace execution of java > applications at runtime. See the tapset/hotspot.stp file for > documentation of the various trace points and arguments available. > - Allow building of other virtual machines besides the default VM. Additional > virtual machines on architectures where hotspot is available are cacao > and zero (or shark), and cacao, where zero (or shark) is available. It's > not possible to build cacao as the default VM, and zero as additional VM. > - New options --enable-nimbus and --enable-nimbus-generation. The default > is that the first is on but the second is off, so Nimbus is built but > without needing to generate the files using JIBX > (http://jibx.sourceforge.net/). > - VisualVM updated to 1.1.1. > - Many build fixes, notably to make netx/the plugin work. IcedTea7 now > avoids the binary plug mechanism in favour of using the same method as > CORBA, JAXP, JAXWS and langtools to import the plugin/netx code. > - Several web browser plugin and javaws support fixes: > - Fixed security handling to prevent access denials when there is a site > specific exception in the policy file > - Allow extensions (chrome) to run Java code with full permissions > - Added non-trusted SSL support to WebStart (javaws) > - Added proxy support > - Other improvements that were breaking specific sites (tag parser fix, > nested jar support, etc.) > - Added JVM Console (used by http://chrispederick.com/work/web-developer/) > - Experimental new plugin enabled by --enable-npplugin. > - Original plugin is now enabled by --enable-plugin, not --enable-liveconnect. > - LCMS security fixes. > - Many build improvements. > - Many zero/shark jtreg fixes. > - Other bug fixes. > ----------------- > > The tarball can be found here: > http://icedtea.classpath.org/download/source/icedtea-1.10.tar.gz > > Thanks to Lillian Angel, Fedora RPMs will shortly be available from: > http://langel.fedorapeople.org/java-1.7.0-openjdk/ > RPMs (i386 and x86_64) and the SRPM are now available. Cheers, Lillian > Ubuntu packages will also be available shortly; Matthias Klose will > provide further information via e-mail when this occurs. > > The following people helped with this release: > Lillian Angel, Gary Benson, Deepak Bhole, Andrew Haley, Andrew John > Hughes, Ioana Ivan, Matthias Klose, Omair Majid, Xerxes R??nby, Robert > Schuster, Mark Wielaard > > We would also like to thank all the bug reporters and testers! > > To get started: > $ hg clone http://icedtea.classpath.org/hg/release/icedtea-1.10 > $ cd icedtea-1.10 > > Full build requirements and instructions are in INSTALL: > $ ./configure [--enable-visualvm --with-openjdk --enable-pulse-java > --enable-systemtap --enable-zero --enable-shark...] > $ make > > If you're packaging 1.10 for your distro, now is the time to start your engines! > From a.radke at arcor.de Fri May 29 14:22:21 2009 From: a.radke at arcor.de (Andreas Radke) Date: Fri, 29 May 2009 23:22:21 +0200 Subject: fixing font paths/names for my distribution Message-ID: <20090529232221.32a4efe4@workstation64.home> What's the recommended way to set proper font paths/names for my distribution ArchLinux? [andyrtr at workstation64 trunk]$ ls -1 src/icedtea6-926c38e2b283/openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/ linux.fontconfig.Fedora.properties linux.fontconfig.SuSE.properties linux.fontconfig.Ubuntu.properties linux.fontconfig.properties solaris.fontconfig.5.8.properties solaris.fontconfig.5.9.properties solaris.fontconfig.properties And there's the icedtea-fonts-patch that touches Fedora and Ubuntu properties. Is there any way to get our own properties file used or should we patch the linux.fontconfig.properties file? Any documentation about this? -Andy From mark at klomp.org Sat May 30 13:20:58 2009 From: mark at klomp.org (Mark Wielaard) Date: Sat, 30 May 2009 22:20:58 +0200 Subject: icedtea7 nio2 overlay Message-ID: <1243714858.3752.68.camel@hermans.wildebeest.org> Hi, After going over the nio2 related make check failures with Alan Bateman we discovered that --enable-nio2 is still the default and that it still copies over some files from the nio2 overlay. In particular it copies over the non-final zipfs and the java.io.Inputs/Outputs classes which are still experimental. That causes a couple of test failures, in particular java/io/Inputs/Basic and demo/nio/ZipFileSystem/sanity. I would like to propose to not add these to our nio2 implementation until/unless they are included in jdk7 proper. Would it be OK if I just removed the nio2 overlay and the whole --enable-nio2 configury/build machinery? 2009-05-30 Mark Wielaard * configure.ac (enable-nio): Removed. * Makefile.am (ICEDTEA_PATCHES): Remove patches/icedtea-nio2.patch. (stamps/overlay.stamp): Don't copy overlays/nio. * patches/icedtea-nio2.patch: Removed. * overlays/nio/*: Removed. If people prefer to keep it around, then I would like to switch the default to --disable-nio2. Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: nio2-overlay-build-remove.patch Type: text/x-patch Size: 1422 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090530/5c8c7c34/nio2-overlay-build-remove.patch From gnu_andrew at member.fsf.org Sat May 30 16:45:00 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Sun, 31 May 2009 00:45:00 +0100 Subject: icedtea7 nio2 overlay In-Reply-To: <1243714858.3752.68.camel@hermans.wildebeest.org> References: <1243714858.3752.68.camel@hermans.wildebeest.org> Message-ID: <17c6771e0905301645u29b77344nb25b2150dd895878@mail.gmail.com> 2009/5/30 Mark Wielaard : > Hi, > > After going over the nio2 related make check failures with Alan Bateman > we discovered that --enable-nio2 is still the default and that it still > copies over some files from the nio2 overlay. In particular it copies > over the non-final zipfs and the java.io.Inputs/Outputs classes which > are still experimental. That causes a couple of test failures, in > particular java/io/Inputs/Basic and demo/nio/ZipFileSystem/sanity. > > I would like to propose to not add these to our nio2 implementation > until/unless they are included in jdk7 proper. Would it be OK if I just > removed the nio2 overlay and the whole --enable-nio2 configury/build > machinery? > > 2009-05-30 ?Mark Wielaard ? > > ? ?* configure.ac (enable-nio): Removed. > ? ?* Makefile.am (ICEDTEA_PATCHES): Remove patches/icedtea-nio2.patch. > ? ?(stamps/overlay.stamp): Don't copy overlays/nio. > ? ?* patches/icedtea-nio2.patch: Removed. > ? ?* overlays/nio/*: Removed. > > If people prefer to keep it around, then I would like to switch the > default to --disable-nio2. > > Cheers, > > Mark > I was thinking about this too, but didn't want to change it just before the release in case something else broke. The additional files don't really interact with anything else in the build and there is always --disable-nio2 in the release. Of course, now we are (finally) post-release, I'm more than happy for this change to go in, as long as the committed patch also hg rms the files in overlays/nio2 (your ChangeLog also has a typo: it says overlays/nio). When I can face hacking on IcedTea7 again, I want to try and simplify the build further. One thing this release reinforced for me was how many build permutations we have and it's just ridiculous trying to test them all. As IcedTea7 has been maintained, used and tested almost solely by myself before the release, when others started to join in too things were found to be broken. It seems we all have slightly different ways of building things and if they are not regularly tested, they break down. This is especially true of jdk7 where the underlying OpenJDK code is changing at a much more rapid rate. For OpenJDK6, build drops are becoming almost bi-annually and you can probably investigate each and every changeset if necessary. For jdk7, build drops are weekly and changesets pour in from numerous feeder repositories. This is also why I suggest we need to reevaluate the inclusion of third-party code such as Xrender and CACAO; the upstream (or someone at least) needs to be following jdk7 development. I saw Clemens discussed Xrender with you on IRC after I left last night. If Clemens plans to base his forest on the 2d forest, then we probably shouldn't pull from there as there may be 2d changes that aren't in the jdk7 master. At present, the IcedTea forest feeds from the jdk7 master and has a few patches on top which didn't make b59 (a LCMS security patch from aph and the DISABLE_NIMBUS changeset from myself, both imported from the build forest IIRC). It may be better to just wait for Xrender to appear in jdk7 as far as IcedTea7 goes. -- 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 Sat May 30 17:12:01 2009 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Sun, 31 May 2009 01:12:01 +0100 Subject: Releases, releases, releases Message-ID: <17c6771e0905301712r1537a591gc77c0d8ad6c52883@mail.gmail.com> Hi all, I just want to post this while it's on my mind, IcedTea6 1.5 and IcedTea7 1.10 having being released on Friday. I think we need to come up with a more clear process for releases than we have now, which will hopefully avoid some of the confusion and tension that has arisen recently. As people regularly hacking on IcedTea are more than well aware, IcedTea has grown far beyond its original designs of just being a build infrastructure for OpenJDK and now incorporates a lot of patches and build options. It's been good to see lots of work going on and input from various people across the community. However, people hacking on IcedTea will also be painfully aware of how long it takes to do a full bootstrap build and the even longer length of time it takes to run the jtreg tests. As such, we really need to prioritise which builds are tested as part of the release process and which tests are run. Of the top of my head, for IcedTea7 I think we ended up testing: * Intree build with default settings * Intree build using --with-openjdk * Intree build using --with-icedtea (I'm not convinced there is really any need for a difference between this and openjdk, and I'd prefer we drop one) * Out-of-tree build with default settings * Out-of-tree build using --with-icedtea * Out-of-tree build with Zero * Out-of-tree build with Shark * Out-of-tree build with CACAO * Out-of-tree build without the plugin and probably some more we forgot. By default settings, I tend to include everything but things that specify paths to zips/dirs or --with-parallel-jobs, which I always tend to use to speed up the build. However, these clearly will also affect things. For clarity, an intree build is one where configure is run from the checked out hg repo as ./configure. An out-of-tree build is where something like the following is done: $ pwd /icedtea $ cd .. $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea/configure so that the build directory is not the same as the source directory. The advantage of this is cleanliness. The build directory can easily be removed to ensure new builds are always clean. make distcheck always does such a build, and I ensure this works before making a release. It notably also tests that the build works when the source directory is read-only, which required some changes to IcedTea that may not have propagated from 7 to 6 (I'm as guilty for not testing 6 as others are for not testing 7 regularly). For anyone interested, I maintain my build scripts in a public Mercurial repository at http://fuseyism.com/hg/scripts. This does an out-of-directory build and will do zero/shark/cacao builds automatically depending on the name of the script that is actually run (e.g. symlink icedtea.sh to cacao.sh, do ./cacao.sh and you get a cacao build). This is clearly a long and tedious list for testing on every change so we need to narrow down which ones are most release-critical and which features really need to be tested, which are useful but not critical. For the IcedTea7 release, we decided not to make the CACAO build release-critical due to a bug (http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=128) that at least myself and one of the CACAO devs (Ringding on #cacao at FreeNode) have reproduced. I think something like that needs regular testing, especially for 7, and support from upstream. As to JTReg, I don't think either 6 or 7 yet have a clean run (i.e. 100% pass). I've tended to give less regards to results for 7 after finding some tests wouldn't even compile, having been broken by API changes (see https://bugs.openjdk.java.net/show_bug.cgi?id=100012 for example). If we're going to run this before releases, we need a clear baseline so we can identify regressions, and ideally continuous testing so we can spot regressions as soon as they happen. As to the actual release process, I think we cleared most of it up but for clarity, we now propose a release at least a week in advance and a branch is created for release work once tip is considered stable enough to undergo pre-release testing. This branch can then also be used for minor releases, while tip remains open for new major release features. If we have a clear release procedure, I think it will be easier for everyone to collaborate on future releases and ensure a smoother and more hassle-free process. Clear goals for a release and easy delineation of work are thus the order of the day. -- 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 a.radke at arcor.de Sun May 31 01:43:11 2009 From: a.radke at arcor.de (Andreas Radke) Date: Sun, 31 May 2009 10:43:11 +0200 Subject: fixing font paths/names for my distribution In-Reply-To: <20090529232221.32a4efe4@workstation64.home> References: <20090529232221.32a4efe4@workstation64.home> Message-ID: <20090531104311.3a88524d@laptop64.home> Am Fri, 29 May 2009 23:22:21 +0200 schrieb Andreas Radke : > What's the recommended way to set proper font paths/names for my > distribution ArchLinux? > > [andyrtr at workstation64 trunk]$ ls -1 > src/icedtea6-926c38e2b283/openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/ > linux.fontconfig.Fedora.properties linux.fontconfig.SuSE.properties > linux.fontconfig.Ubuntu.properties > linux.fontconfig.properties > solaris.fontconfig.5.8.properties > solaris.fontconfig.5.9.properties > solaris.fontconfig.properties > > And there's the icedtea-fonts-patch that touches Fedora and Ubuntu > properties. > > Is there any way to get our own properties file used or should we > patch the linux.fontconfig.properties file? Any documentation about > this? > > -Andy > Hm. I had to change the linux.fontconfig.Ubuntu.properties file. Why not the default one? -Andy From mark at klomp.org Sun May 31 06:28:44 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 31 May 2009 13:28:44 +0000 Subject: changeset in /hg/icedtea: * configure.ac (enable-nio2): Removed. Message-ID: changeset e9bd43d303d1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e9bd43d303d1 description: * configure.ac (enable-nio2): Removed. * Makefile.am (ICEDTEA_PATCHES): Remove patches/icedtea-nio2.patch. (stamps/overlay.stamp): Don't copy overlays/nio2. * patches/icedtea-nio2.patch: Removed. * overlays/nio2/*: Removed. diffstat: 31 files changed, 8 insertions(+), 5213 deletions(-) ChangeLog | 8 Makefile.am | 7 configure.ac | 8 overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile | 37 overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile | 40 overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile | 50 overlays/nio2/openjdk/jdk/src/share/classes/java/io/Inputs.java | 385 --- overlays/nio2/openjdk/jdk/src/share/classes/java/io/Outputs.java | 357 --- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider | 1 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt | 29 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java | 44 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java | 76 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java | 57 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java | 76 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java | 154 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java | 93 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java | 187 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java | 125 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java | 1027 ---------- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java | 230 -- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java | 166 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java | 300 -- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java | 243 -- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java | 75 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java | 308 -- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java | 481 ---- overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java | 165 - overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java | 168 - overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh | 71 overlays/nio2/openjdk/jdk/test/java/io/Inputs/Basic.java | 218 -- patches/icedtea-nio2.patch | 35 diffs (truncated from 5368 to 500 lines): diff -r d6a26e712b1a -r e9bd43d303d1 ChangeLog --- a/ChangeLog Fri May 29 17:46:17 2009 +0100 +++ b/ChangeLog Sun May 31 15:29:57 2009 +0200 @@ -1,3 +1,11 @@ 2009-05-27 Andrew John Hughes + + * configure.ac (enable-nio2): Removed. + * Makefile.am (ICEDTEA_PATCHES): Remove patches/icedtea-nio2.patch. + (stamps/overlay.stamp): Don't copy overlays/nio2. + * patches/icedtea-nio2.patch: Removed. + * overlays/nio2/*: Removed. + 2009-05-27 Andrew John Hughes * Makefile.am: diff -r d6a26e712b1a -r e9bd43d303d1 Makefile.am --- a/Makefile.am Fri May 29 17:46:17 2009 +0100 +++ b/Makefile.am Sun May 31 15:29:57 2009 +0200 @@ -2113,10 +2113,6 @@ ICEDTEA_PATCHES += \ patches/icedtea-javafiles.patch endif -if ENABLE_NIO2 -ICEDTEA_PATCHES += patches/icedtea-nio2.patch -endif - if ENABLE_SYSTEMTAP ICEDTEA_PATCHES += patches/icedtea-systemtap.patch endif @@ -2436,9 +2432,6 @@ stamps/overlay.stamp: stamps/patch.stamp sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \ openjdk/jdk/make/common/shared/Defs.gmk; \ cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ -if ENABLE_NIO2 - cp -r $(abs_top_srcdir)/overlays/nio2/openjdk/* openjdk/ -endif chmod -R ug+w openjdk touch stamps/overlay.stamp diff -r d6a26e712b1a -r e9bd43d303d1 configure.ac --- a/configure.ac Fri May 29 17:46:17 2009 +0100 +++ b/configure.ac Sun May 31 15:29:57 2009 +0200 @@ -194,14 +194,6 @@ AC_ARG_ENABLE([xrender], [ENABLE_XRENDER="${enableval}"], [ENABLE_XRENDER='yes']) AM_CONDITIONAL([ENABLE_XRENDER], [test x$ENABLE_XRENDER = xyes]) AC_MSG_RESULT(${ENABLE_XRENDER}) - -AC_MSG_CHECKING(whether to include NIO2 support) -AC_ARG_ENABLE([nio2], - [AS_HELP_STRING([--disable-nio2], - [Disable inclusion of backported NIO2])], - [ENABLE_NIO2="${enableval}"], [ENABLE_NIO2='yes']) -AM_CONDITIONAL([ENABLE_NIO2], [test x$ENABLE_NIO2 = xyes]) -AC_MSG_RESULT(${ENABLE_NIO2}) AC_MSG_CHECKING([whether to include SystemTap tracing support]) AC_ARG_ENABLE([systemtap], diff -r d6a26e712b1a -r e9bd43d303d1 overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile --- a/overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile Fri May 29 17:46:17 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# -# Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. -# 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. Sun designates this -# particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. -# -# 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. -# -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. -# - -# -# Makefile for building the NIO demo(s) -# - -BUILDDIR = ../.. -PRODUCT = demos -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = ZipFileSystem - -all build clean clobber:: - $(SUBDIRS-loop) diff -r d6a26e712b1a -r e9bd43d303d1 overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile --- a/overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile Fri May 29 17:46:17 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -# -# Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. -# 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. Sun designates this -# particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. -# -# 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. -# -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. -# - -BUILDDIR = ../../.. -PRODUCT = demo/nio -DEMONAME = ZipFileSystem -include $(BUILDDIR)/common/Defs.gmk - -DEMO_ROOT = $(SHARE_SRC)/demo/nio/$(DEMONAME) -DEMO_TOPFILES = ./README.txt -DEMO_MAINCLASS = $(DEMONAME) -DEMO_DESTDIR = $(DEMODIR)/nio/$(DEMONAME) - -# -# Demo jar building rules. -# -include $(BUILDDIR)/common/Demo.gmk - diff -r d6a26e712b1a -r e9bd43d303d1 overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile --- a/overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile Fri May 29 17:46:17 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -# -# Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. -# 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. Sun designates this -# particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. -# -# 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. -# -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. -# - -# -# Makefile for the nio/aio sample code -# - -BUILDDIR = ../../.. - -PRODUCT = java - -include $(BUILDDIR)/common/Defs.gmk - -SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/nio/aio -SAMPLE_DST_DIR = $(SAMPLEDIR)/nio/aio - -SAMPLE_FILES = \ - $(SAMPLE_DST_DIR)/EchoServer.java - -all build: $(SAMPLE_FILES) - -$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/% - $(install-file) - -clean clobber: - $(RM) -r $(SAMPLE_DST_DIR) - -.PHONY: all build clean clobber diff -r d6a26e712b1a -r e9bd43d303d1 overlays/nio2/openjdk/jdk/src/share/classes/java/io/Inputs.java --- a/overlays/nio2/openjdk/jdk/src/share/classes/java/io/Inputs.java Fri May 29 17:46:17 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,385 +0,0 @@ -/* - * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * 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 conne02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package java.io; - -import java.nio.charset.Charset; -import java.nio.charset.UnsupportedCharsetException; -import java.nio.file.FileRef; -import java.nio.file.attribute.Attributes; -import java.nio.channels.Channels; -import java.util.Scanner; -import java.util.Collections; -import java.util.Arrays; -import java.util.ArrayList; -import java.util.List; - -/** - * {@note experimental} - * This class consists exclusively of static methods that operate on input - * sources. - * - *

The methods to read lines of text defined by this class recognize the - * following as Unicode line terminators: - *

    - *
  • \u000D followed by \u000A, - * CARRIAGE RETURN followed by LINE FEED
  • - *
  • \u000A, LINE FEED
  • - *
  • \u000D, CARRIAGE RETURN
  • - *
  • \u2028, LINE SEPARATOR
  • - *
  • \u2029, PARAGRAPH SEPARATOR
  • - *
  • \u0085, NEXT LINE (NEL)
  • - *
- * - * @since 1.7 - */ - -public final class Inputs { - private Inputs() { } - - // initial buffer size when reading (or writing) - private static final int INITIAL_BUFFER_SIZE = 8192; - - // checks that charset is supported - private static void ensureCharsetIsSupported(String csn) { - if (csn == null) - throw new NullPointerException("'csn' is null"); - if (!Charset.isSupported(csn)) - throw new UnsupportedCharsetException(csn); - } - - /** - * Closes the given data source by invoking its {@link Closeable#close close} - * method. If the {@code close} method throws an {@code IOException} then it - * is silently ignored. If the source is already closed then invoking this - * method has no effect. - * - *

This method should not be used to close destinations or output - * streams that may be buffered. An I/O error may occur when flushing - * buffered data. - * - * @param source - * The data source - */ - public static void closeUnchecked(Closeable source) { - try { - source.close(); - } catch (IOException ignore) { } - } - - /** - * Read all bytes from the specified file. When all bytes have been read, or - * an I/O error occurs, then the file is closed. - * - * @param source - * The data source - * - * @return A byte array containing the bytes read from the file - * - * @throws IOException - * If an I/O error occurs - * @throws OutOfMemoryError - * If the required array size is too large - */ - public static byte[] readAllBytes(FileRef source) throws IOException { - long size = Attributes.readBasicFileAttributes(source).size(); - if (size > (long)Integer.MAX_VALUE) - throw new OutOfMemoryError("Required array size too large"); - InputStream in = Channels.newInputStream(source.newByteChannel()); - try { - return implReadAllBytes(in, Math.min((int)size, INITIAL_BUFFER_SIZE)); - } finally { - in.close(); - } - } - - /** - * Read all bytes from the specified file. When all bytes have been read, or - * an I/O error occurs, then the file is closed. - * - * @param source - * The data source - * - * @return A byte array containing the bytes read from the file - * - * @throws IOException - * If an I/O error occurs - * @throws OutOfMemoryError - * If the required array size is too large - */ - public static byte[] readAllBytes(File source) throws IOException { - InputStream in = new FileInputStream(source); - try { - return implReadAllBytes(in, INITIAL_BUFFER_SIZE); - } finally { - in.close(); - } - } - - /** - * Read all bytes from the specified input stream. - * - *

Usage Example: - * Suppose we want to open a connection to a resource identified by a URI, - * and read all bytes: - *

-     *   byte[] content;
-     *   InputStream in = uri.toURL().openStream();
-     *   try {
-     *       content = Inputs.readAllBytes(in);
-     *   } finally {
-     *       Inputs.closeUnchecked(in);
-     *   }
-     * 
- * - *

On return, the input stream will be at end of stream. - * - * @param source - * The data source - * - * @return A byte array containing the bytes read from the source - * - * @throws IOException - * If an I/O error occurs - * @throws OutOfMemoryError - * If the required array size is too large - */ - public static byte[] readAllBytes(InputStream source) throws IOException { - return implReadAllBytes(source, INITIAL_BUFFER_SIZE); - } - - private static byte[] implReadAllBytes(InputStream source, int initialSize) - throws IOException - { - byte[] buf = new byte[initialSize]; - int nread = 0; - int rem = buf.length; - int n; - while ((n = source.read(buf, nread, rem)) > 0) { - nread += n; - rem -= n; - if (rem <= 0) { - int newSize = buf.length << 1; - if (newSize <= buf.length) { - if (buf.length == Integer.MAX_VALUE) - throw new OutOfMemoryError("Required array size too large"); - newSize = Integer.MAX_VALUE; - } - rem = newSize - buf.length; - buf = Arrays.copyOf(buf, newSize); - } - } - return (buf.length == nread) ? buf : Arrays.copyOf(buf, nread); - } - - /** - * Read all lines from the specified file. Bytes from the file are - * converted into characters using the specified charset. When all lines - * have been read, or an I/O error occurs, then the file is closed. - * - * @param source - * The data source - * @param csn - * The name of the charset to be used - * - * @throws java.nio.charset.UnsupportedCharsetException - * If no support for the named charset is available - * in this instance of the Java virtual machine - * @throws java.nio.charset.MalformedInputException - * If the file contains a byte sequence that is not legal for the - * charset - * @throws IOException - * If an I/O error occurs - */ - public static List readAllLines(FileRef source, String csn) - throws IOException - { - ensureCharsetIsSupported(csn); - Scanner s = new Scanner(source, csn); - try { - return implReadAllLines(s); - } finally { - s.close(); - } - } - - /** - * Read all lines from the specified file. Bytes from the file are - * converted into characters using the underlying platform's {@linkplain - * java.nio.charset.Charset#defaultCharset() default charset}. When all lines - * have been read, or an I/O error occurs, then the file is closed. - * - * @param source - * The data source - * - * @throws java.nio.charset.MalformedInputException - * If the file contains a byte sequence that is not legal for the - * default charset - * @throws IOException - * If an I/O error occurs - */ - public static List readAllLines(FileRef source) throws IOException { - Scanner s = new Scanner(source); - try { - return implReadAllLines(s); - } finally { - s.close(); - } - } - - /** - * Read all lines from the specified file. Bytes from the file are - * converted into characters using the specified charset. When all lines - * have been read, or an I/O error occurs, then the file is closed. - * - * @param source - * The data source - * @param csn - * The name of the charset to be used - * - * @throws UnsupportedCharsetException - * If no support for the named charset is available - * in this instance of the Java virtual machine - * @throws java.nio.charset.MalformedInputException - * If the file contains a byte sequence that is not legal for the - * charset - * @throws IOException - * If an I/O error occurs - */ - public static List readAllLines(File source, String csn) - throws IOException - { - ensureCharsetIsSupported(csn); - Scanner s = new Scanner(source, csn); - try { - return implReadAllLines(s); - } finally { - s.close(); - } - } - - /** - * Read all lines from the specified file. Bytes from the file are - * converted into characters using the underlying platform's {@linkplain - * Charset#defaultCharset() default charset}. When all lines have been read, - * or an I/O error occurs, then the file is closed. - * - * @param source - * The data source - * @throws java.nio.charset.MalformedInputException - * If the file contains a byte sequence that is not legal for the - * default charset - * @throws IOException - * If an I/O error occurs - */ - public static List readAllLines(File source) throws IOException { - Scanner s = new Scanner(source); - try { - return implReadAllLines(s); From mark at klomp.org Sun May 31 06:30:04 2009 From: mark at klomp.org (Mark Wielaard) Date: Sun, 31 May 2009 15:30:04 +0200 Subject: icedtea7 nio2 overlay In-Reply-To: <17c6771e0905301645u29b77344nb25b2150dd895878@mail.gmail.com> References: <1243714858.3752.68.camel@hermans.wildebeest.org> <17c6771e0905301645u29b77344nb25b2150dd895878@mail.gmail.com> Message-ID: <1243776605.11727.79.camel@hermans.wildebeest.org> Hi Andrew, On Sun, 2009-05-31 at 00:45 +0100, Andrew John Hughes wrote: > 2009/5/30 Mark Wielaard : > Of course, now we are (finally) post-release, I'm more than happy for > this change to go in, as long as the committed patch also hg rms the > files in overlays/nio2 (your ChangeLog also has a typo: it says > overlays/nio). Thanks, done as follows (with typos fixed): 2009-05-30 Mark Wielaard * configure.ac (enable-nio2): Removed. * Makefile.am (ICEDTEA_PATCHES): Remove patches/icedtea-nio2.patch. (stamps/overlay.stamp): Don't copy overlays/nio2. * patches/icedtea-nio2.patch: Removed. * overlays/nio2/*: Removed. Cheers, Mark