changeset 527:afd16fa8b690

. Merging in changes from BSD repo.
author glewis@misty.eyesbeyond.com
date Thu, 22 Jan 2009 18:51:55 -0800
parents 0273528e9e37 4244db6cd9a9
children 0c813371a392
files
diffstat 13 files changed, 33 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_Runtime1_x86.cpp	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/cpu/x86/vm/c1_Runtime1_x86.cpp	Thu Jan 22 18:51:55 2009 -0800
@@ -1393,7 +1393,7 @@
         __ ret(0);
 
         __ bind(miss);
-        __ movptr(Address(rsp, (super_off) * VMRegImpl::stack_slot_size), 0); // result
+        __ movptr(Address(rsp, (super_off) * VMRegImpl::stack_slot_size), NULL_WORD); // result
         __ pop(rax);
         __ pop(rcx);
         __ pop(rsi);
--- a/src/cpu/x86/vm/interp_masm_x86_32.cpp	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/cpu/x86/vm/interp_masm_x86_32.cpp	Thu Jan 22 18:51:55 2009 -0800
@@ -149,7 +149,7 @@
   // Clean up tos value in the thread object
   movl(tos_addr,  (int32_t) ilgl);
   movptr(val_addr,  NULL_WORD);
-  NOT_LP64(movl(val_addr1, (int32_t)NULL_WORD));
+  NOT_LP64(movptr(val_addr1, NULL_WORD));
 }
 
 
@@ -470,10 +470,10 @@
 void InterpreterMacroAssembler::tag_local(frame::Tag tag, int n) {
   if (TaggedStackInterpreter) {
     if (tag == frame::TagCategory2) {
-      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (int32_t)frame::TagValue);
-      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)frame::TagValue);
+      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (intptr_t)frame::TagValue);
+      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)frame::TagValue);
     } else {
-      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)tag);
+      movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)tag);
     }
   }
 }
@@ -482,12 +482,12 @@
   if (TaggedStackInterpreter) {
     if (tag == frame::TagCategory2) {
       movptr(Address(rdi, idx, Interpreter::stackElementScale(),
-                  Interpreter::local_tag_offset_in_bytes(1)), (int32_t)frame::TagValue);
+                  Interpreter::local_tag_offset_in_bytes(1)), (intptr_t)frame::TagValue);
       movptr(Address(rdi, idx, Interpreter::stackElementScale(),
-                    Interpreter::local_tag_offset_in_bytes(0)), (int32_t)frame::TagValue);
+                    Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)frame::TagValue);
     } else {
       movptr(Address(rdi, idx, Interpreter::stackElementScale(),
-                               Interpreter::local_tag_offset_in_bytes(0)), (int32_t)tag);
+                               Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)tag);
     }
   }
 }
@@ -1319,7 +1319,7 @@
   int recvr_offset = in_bytes(VirtualCallData::receiver_offset(start_row));
   set_mdp_data_at(mdp, recvr_offset, receiver);
   int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row));
-  movptr(reg2, (int32_t)DataLayout::counter_increment);
+  movptr(reg2, (intptr_t)DataLayout::counter_increment);
   set_mdp_data_at(mdp, count_offset, reg2);
   jmp(done);
 }
@@ -1458,7 +1458,7 @@
     test_method_data_pointer(mdp, profile_continue);
 
     // Build the base (index * per_case_size_in_bytes()) + case_array_offset_in_bytes()
-    movptr(reg2, (int32_t)in_bytes(MultiBranchData::per_case_size()));
+    movptr(reg2, (intptr_t)in_bytes(MultiBranchData::per_case_size()));
     // index is positive and so should have correct value if this code were
     // used on 64bits
     imulptr(index, reg2);
--- a/src/cpu/x86/vm/interpreterRT_x86_32.cpp	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/cpu/x86/vm/interpreterRT_x86_32.cpp	Thu Jan 22 18:51:55 2009 -0800
@@ -110,7 +110,7 @@
   virtual void pass_object() {
     // pass address of from
     intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0));
-    *_to++ = (*(intptr_t*)from_addr == 0) ? NULL : from_addr;
+    *_to++ = (*(intptr_t*)from_addr == 0) ? NULL_WORD : from_addr;
     debug_only(verify_tag(frame::TagReference));
     _from -= Interpreter::stackElementSize();
    }
--- a/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Thu Jan 22 18:51:55 2009 -0800
@@ -407,7 +407,7 @@
     __ get_thread(rcx);
     __ pop(rdx);
     __ movptr(rax, Address(rcx, Thread::pending_exception_offset()));
-    __ movptr(Address(rcx, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
+    __ movptr(Address(rcx, Thread::pending_exception_offset()), NULL_WORD);
 
 #ifdef ASSERT
     // make sure exception is set
--- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Thu Jan 22 18:51:55 2009 -0800
@@ -382,7 +382,7 @@
   // indicating if the counter overflow occurs at a backwards branch (non-NULL bcp).
   // The call returns the address of the verified entry point for the method or NULL
   // if the compilation did not complete (either went background or bailed out).
-  __ movptr(rax, (int32_t)false);
+  __ movptr(rax, (intptr_t)false);
   __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax);
 
   __ movptr(rbx, Address(rbp, method_offset));   // restore methodOop
--- a/src/cpu/x86/vm/templateTable_x86_32.cpp	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/cpu/x86/vm/templateTable_x86_32.cpp	Thu Jan 22 18:51:55 2009 -0800
@@ -137,10 +137,10 @@
         // Do the actual store
         // noreg means NULL
         if (val == noreg) {
-          __ movl(Address(rdx, 0), (int32_t)NULL_WORD);
+          __ movptr(Address(rdx, 0), NULL_WORD);
           // No post barrier for NULL
         } else {
-          __ movl(Address(rdx, 0), val);
+          __ movptr(Address(rdx, 0), val);
           __ g1_write_barrier_post(rdx, rax, rcx, rbx, rsi);
         }
         __ restore_bcp();
@@ -152,9 +152,9 @@
     case BarrierSet::CardTableExtension:
       {
         if (val == noreg) {
-          __ movl(obj, NULL_WORD);
+          __ movptr(obj, NULL_WORD);
         } else {
-          __ movl(obj, val);
+          __ movptr(obj, val);
           // flatten object address if needed
           if (!precise || (obj.index() == noreg && obj.disp() == 0)) {
             __ store_check(obj.base());
@@ -168,9 +168,9 @@
     case BarrierSet::ModRef:
     case BarrierSet::Other:
       if (val == noreg) {
-        __ movl(obj, NULL_WORD);
+        __ movptr(obj, NULL_WORD);
       } else {
-        __ movl(obj, val);
+        __ movptr(obj, val);
       }
       break;
     default      :
--- a/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	Thu Jan 22 18:51:55 2009 -0800
@@ -28,6 +28,7 @@
 binaryTreeDictionary.cpp                binaryTreeDictionary.hpp
 binaryTreeDictionary.cpp                globals.hpp
 binaryTreeDictionary.cpp                ostream.hpp
+binaryTreeDictionary.cpp                space.inline.hpp
 binaryTreeDictionary.cpp                spaceDecorator.hpp
 
 binaryTreeDictionary.hpp                freeBlockDictionary.hpp
--- a/src/share/vm/gc_implementation/includeDB_gc_g1	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/share/vm/gc_implementation/includeDB_gc_g1	Thu Jan 22 18:51:55 2009 -0800
@@ -34,6 +34,7 @@
 collectionSetChooser.cpp		g1CollectedHeap.hpp
 collectionSetChooser.cpp		g1CollectorPolicy.hpp
 collectionSetChooser.cpp		collectionSetChooser.hpp
+collectionSetChooser.cpp		space.inline.hpp
 
 collectionSetChooser.hpp		heapRegion.hpp
 collectionSetChooser.hpp                growableArray.hpp
@@ -44,6 +45,7 @@
 concurrentG1Refine.cpp			copy.hpp
 concurrentG1Refine.cpp			g1CollectedHeap.hpp
 concurrentG1Refine.cpp			g1RemSet.hpp
+concurrentG1Refine.cpp			space.inline.hpp
 
 concurrentG1Refine.hpp			globalDefinitions.hpp
 
@@ -264,7 +266,7 @@
 heapRegion.cpp                          iterator.hpp
 heapRegion.cpp                          oop.inline.hpp
 
-heapRegion.hpp                          space.hpp
+heapRegion.hpp                          space.inline.hpp
 heapRegion.hpp                          spaceDecorator.hpp
 heapRegion.hpp                          g1BlockOffsetTable.inline.hpp
 heapRegion.hpp                          watermark.hpp
--- a/src/share/vm/gc_implementation/includeDB_gc_parNew	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/share/vm/gc_implementation/includeDB_gc_parNew	Thu Jan 22 18:51:55 2009 -0800
@@ -29,6 +29,8 @@
 asParNewGeneration.cpp                  cmsAdaptiveSizePolicy.hpp
 asParNewGeneration.cpp                  cmsGCAdaptivePolicyCounters.hpp
 asParNewGeneration.cpp                  defNewGeneration.inline.hpp
+asParNewGeneration.cpp                  markOop.inline.hpp
+asParNewGeneration.cpp                  markSweep.inline.hpp
 asParNewGeneration.cpp                  oop.pcgc.inline.hpp
 asParNewGeneration.cpp                  parNewGeneration.hpp
 asParNewGeneration.cpp                  referencePolicy.hpp
@@ -40,7 +42,7 @@
 parCardTableModRefBS.cpp                java.hpp
 parCardTableModRefBS.cpp                mutexLocker.hpp
 parCardTableModRefBS.cpp                sharedHeap.hpp
-parCardTableModRefBS.cpp                space.hpp
+parCardTableModRefBS.cpp                space.inline.hpp
 parCardTableModRefBS.cpp                universe.hpp
 parCardTableModRefBS.cpp                virtualspace.hpp
 
--- a/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	Thu Jan 22 18:51:55 2009 -0800
@@ -306,6 +306,8 @@
 psPermGen.cpp                           psMarkSweepDecorator.hpp
 psPermGen.cpp                           psParallelCompact.hpp
 psPermGen.cpp                           psPermGen.hpp
+psPermGen.cpp                           markOop.inline.hpp
+psPermGen.cpp                           markSweep.inline.hpp
 
 psPermGen.hpp                           psOldGen.hpp
 
--- a/src/share/vm/includeDB_compiler2	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/share/vm/includeDB_compiler2	Thu Jan 22 18:51:55 2009 -0800
@@ -162,7 +162,6 @@
 callGenerator.hpp                       callnode.hpp
 callGenerator.hpp                       compile.hpp
 callGenerator.hpp                       deoptimization.hpp
-callGenerator.hpp                       node.hpp
 callGenerator.hpp                       type.hpp
 
 callnode.cpp                            callnode.hpp
@@ -482,7 +481,6 @@
 graphKit.hpp                            ciEnv.hpp
 graphKit.hpp                            compile.hpp
 graphKit.hpp                            deoptimization.hpp
-graphKit.hpp                            node.hpp
 graphKit.hpp                            phaseX.hpp
 graphKit.hpp                            type.hpp
 
@@ -528,7 +526,6 @@
 
 indexSet.hpp                            allocation.hpp
 indexSet.hpp                            compile.hpp
-indexSet.hpp                            node.hpp
 indexSet.hpp                            regmask.hpp
 indexSet.hpp                            resourceArea.hpp
 
--- a/src/share/vm/includeDB_core	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/share/vm/includeDB_core	Thu Jan 22 18:51:55 2009 -0800
@@ -1810,7 +1810,7 @@
 
 generation.inline.hpp                   genCollectedHeap.hpp
 generation.inline.hpp                   generation.hpp
-generation.inline.hpp                   space.inline.hpp
+generation.inline.hpp                   space.hpp
 
 genOopClosures.hpp                      oop.hpp
 
@@ -2014,7 +2014,7 @@
 instanceKlass.cpp                       vmSymbols.hpp
 
 instanceKlass.hpp                       accessFlags.hpp
-instanceKlass.hpp                       bitMap.hpp
+instanceKlass.hpp                       bitMap.inline.hpp
 instanceKlass.hpp                       constMethodOop.hpp
 instanceKlass.hpp                       constantPoolOop.hpp
 instanceKlass.hpp                       handles.hpp
@@ -2533,7 +2533,6 @@
 
 klass.inline.hpp                        klass.hpp
 klass.inline.hpp                        markOop.hpp
-klass.inline.hpp                        markOop.inline.hpp
 
 klassKlass.cpp                          collectedHeap.hpp
 klassKlass.cpp                          collectedHeap.inline.hpp
@@ -3753,7 +3752,6 @@
 space.hpp                               cardTableModRefBS.hpp
 space.hpp                               iterator.hpp
 space.hpp                               markOop.hpp
-space.hpp                               markOop.inline.hpp
 space.hpp                               memRegion.hpp
 space.hpp                               mutexLocker.hpp
 space.hpp                               os_<os_family>.inline.hpp
@@ -3773,6 +3771,7 @@
 
 spaceDecorator.cpp                      copy.hpp
 spaceDecorator.cpp                      spaceDecorator.hpp
+spaceDecorator.cpp                      space.inline.hpp
 
 specialized_oop_closures.cpp            ostream.hpp
 specialized_oop_closures.cpp            specialized_oop_closures.hpp
@@ -3965,7 +3964,6 @@
 
 synchronizer.hpp                        handles.hpp
 synchronizer.hpp                        markOop.hpp
-synchronizer.hpp                        markOop.inline.hpp
 synchronizer.hpp                        perfData.hpp
 synchronizer.hpp                        top.hpp
 
--- a/src/share/vm/includeDB_features	Thu Jan 22 18:48:24 2009 -0800
+++ b/src/share/vm/includeDB_features	Thu Jan 22 18:51:55 2009 -0800
@@ -59,6 +59,8 @@
 
 dump_<arch_model>.cpp                   assembler_<arch>.inline.hpp
 dump_<arch_model>.cpp                   compactingPermGenGen.hpp
+dump_<arch_model>.cpp                   generation.inline.hpp
+dump_<arch_model>.cpp                   space.inline.hpp
 
 forte.cpp                               collectedHeap.inline.hpp
 forte.cpp                               debugInfoRec.hpp