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/attachment.ksh 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/attachment.bin 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/attachment.bin 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/attachment.bin 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/attachment.bin 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/attachment.bin 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/attachment.bin 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 @@