*** old/src/cpu/x86/vm/vm_version_x86.cpp	Tue Aug 16 10:00:29 2011
--- new/src/cpu/x86/vm/vm_version_x86.cpp	Tue Aug 16 10:00:29 2011

*** 555,572 ****
--- 555,574 ----
    if( AllocatePrefetchInstr > 3 ) AllocatePrefetchInstr = 3;
    if( AllocatePrefetchInstr == 3 && !supports_3dnow_prefetch() ) AllocatePrefetchInstr=0;
    if( !supports_sse() && supports_3dnow_prefetch() ) AllocatePrefetchInstr = 3;
  
    // Allocation prefetch settings
!   intx cache_line_size = L1_data_cache_line_size();
!   intx cache_line_size = prefetch_data_size();
    if( cache_line_size > AllocatePrefetchStepSize )
      AllocatePrefetchStepSize = cache_line_size;
    if( FLAG_IS_DEFAULT(AllocatePrefetchLines) )
      AllocatePrefetchLines = 3; // Optimistic value
+ 
    assert(AllocatePrefetchLines > 0, "invalid value");
    if( AllocatePrefetchLines < 1 )     // set valid value in product VM
!     AllocatePrefetchLines = 1; // Conservative value
!     AllocatePrefetchLines = 3;
+   assert(AllocateInstancePrefetchLines > 0, "invalid value");
+   if( AllocateInstancePrefetchLines < 1 ) // set valid value in product VM
+     AllocateInstancePrefetchLines = 1;
  
    AllocatePrefetchDistance = allocate_prefetch_distance();
    AllocatePrefetchStyle    = allocate_prefetch_style();
  
    if( is_intel() && cpu_family() == 6 && supports_sse3() ) {

*** 599,612 ****
--- 601,615 ----
  #ifndef PRODUCT
    if (PrintMiscellaneous && Verbose) {
      tty->print_cr("Logical CPUs per core: %u",
                    logical_processors_per_package());
      tty->print_cr("UseSSE=%d",UseSSE);
-     tty->print("Allocation: ");
      if (AllocatePrefetchStyle <= 0 || UseSSE == 0 && !supports_3dnow_prefetch()) {
!       tty->print_cr(": no prefetching");
      } else {
+       tty->print(" prefetching: ");
        if (UseSSE == 0 && supports_3dnow_prefetch()) {
          tty->print("PREFETCHW");
        } else if (UseSSE >= 1) {
          if (AllocatePrefetchInstr == 0) {
            tty->print("PREFETCHNTA");

*** 617,629 ****
--- 620,632 ----
          } else if (AllocatePrefetchInstr == 3) {
            tty->print("PREFETCHW");
          }
        }
        if (AllocatePrefetchLines > 1) {
!         tty->print_cr(" %d, %d lines with step %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
!         tty->print_cr(" at distance %d, %d lines of %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
        } else {
!         tty->print_cr(" %d, one line", AllocatePrefetchDistance);
!         tty->print_cr(" at distance %d, one line of %d bytes", AllocatePrefetchDistance, AllocatePrefetchStepSize);
        }
      }
  
      if (PrefetchCopyIntervalInBytes > 0) {
        tty->print_cr("PrefetchCopyIntervalInBytes %d", PrefetchCopyIntervalInBytes);